Add support for conflicting resolutions

dev/checks.nix

@@ -32,7 +32,14 @@ let
       pythonEnv =
         let
           # Generate overlay
-          overlay = ws.mkPyprojectOverlay { inherit sourcePreference environ; };
+          overlay = ws.mkPyprojectOverlay (
+            {
+              inherit sourcePreference environ;
+            }
+            // lib.optionalAttrs (spec != { }) {
+              dependencies = spec;
+            }
+          );
 
           # Construct package set
           pythonSet =
@@ -202,6 +209,28 @@ let
         '';
       };
 
+      conflictsA = mkCheck {
+        name = "conflicts-group-a";
+        root = ../lib/fixtures/conflicts;
+        spec = {
+          conflicts = [ "extra-a" ];
+        };
+        check = ''
+          python -c 'import arpeggio'
+        '';
+      };
+
+      conflictsB = mkCheck {
+        name = "conflicts-group-b";
+        root = ../lib/fixtures/conflicts;
+        spec = {
+          conflicts = [ "extra-b" ];
+        };
+        check = ''
+          python -c 'import arpeggio'
+        '';
+      };
+
       editable-workspace =
         let
           workspaceRoot = ../lib/fixtures/workspace;

flake.nix

@@ -85,11 +85,11 @@
                 self.formatter.${system}
                 pkgs.npins
               ] ++ self.packages.${system}.doc.nativeBuildInputs;
-
-              shellHook = ''
-                export UV_NO_SYNC=1
-                export UV_PYTHON_DOWNLOADS=never
-              '';
+              env = {
+                UV_NO_SYNC = "1";
+                UV_PYTHON_DOWNLOADS = "never";
+                UV_PYTHON = pkgs.python3.interpreter;
+              };
             };
         in
         {

lib/expected/lock1.parseLock.testConflicts.json

@@ -0,0 +1,46 @@
+{
+  "conflicts": [
+    [
+      {
+        "extra": "extra-a",
+        "package": "conflicts"
+      },
+      {
+        "extra": "extra-b",
+        "package": "conflicts"
+      },
+      {
+        "group": "group-c",
+        "package": "conflicts"
+      }
+    ]
+  ],
+  "manifest": {
+    "members": []
+  },
+  "options": {
+    "exclude-newer": null,
+    "prerelease-mode": null,
+    "resolution-mode": null
+  },
+  "requires-python": [
+    {
+      "op": ">=",
+      "version": {
+        "dev": null,
+        "epoch": 0,
+        "local": null,
+        "post": null,
+        "pre": null,
+        "release": [
+          3,
+          12
+        ],
+        "str": "3.12"
+      }
+    }
+  ],
+  "resolution-markers": {},
+  "supported-markers": [],
+  "version": 1
+}

lib/expected/lock1.parseLock.testKitchenSinkA.json

@@ -1,4 +1,5 @@
 {
+  "conflicts": [],
   "manifest": {
     "members": []
   },

lib/expected/lock1.parseLock.testKitchenSinkB.json

@@ -1,4 +1,5 @@
 {
+  "conflicts": [],
   "manifest": {
     "members": []
   },

lib/expected/lock1.parseLock.testKitchenSinkCEditable.json

@@ -1,4 +1,5 @@
 {
+  "conflicts": [],
   "manifest": {
     "members": []
   },

lib/expected/lock1.parseLock.testMultiChoicePackage.json

@@ -1,4 +1,5 @@
 {
+  "conflicts": [],
   "manifest": {
     "members": []
   },

lib/expected/lock1.parseLock.testMultiPythons.json

@@ -1,4 +1,5 @@
 {
+  "conflicts": [],
   "manifest": {
     "members": [
       "multi-depends",

lib/expected/lock1.parseLock.testNo-binary-no-build.json

@@ -1,4 +1,5 @@
 {
+  "conflicts": [],
   "manifest": {
     "members": []
   },

lib/expected/lock1.parseLock.testNo-binary.json

@@ -1,4 +1,5 @@
 {
+  "conflicts": [],
   "manifest": {
     "members": []
   },

lib/expected/lock1.parseLock.testNo-build-no-binary-packages.json

@@ -1,4 +1,5 @@
 {
+  "conflicts": [],
   "manifest": {
     "members": []
   },

lib/expected/lock1.parseLock.testNo-build.json

@@ -1,4 +1,5 @@
 {
+  "conflicts": [],
   "manifest": {
     "members": []
   },

lib/expected/lock1.parseLock.testNoDeps.json

@@ -1,4 +1,5 @@
 {
+  "conflicts": [],
   "manifest": {
     "members": []
   },

lib/expected/lock1.parseLock.testOptionalDeps.json

@@ -1,4 +1,5 @@
 {
+  "conflicts": [],
   "manifest": {
     "members": []
   },

lib/expected/lock1.parseLock.testTrivial.json

@@ -1,4 +1,5 @@
 {
+  "conflicts": [],
   "manifest": {
     "members": []
   },

lib/expected/lock1.parseLock.testWithExtra.json

@@ -1,4 +1,5 @@
 {
+  "conflicts": [],
   "manifest": {
     "members": []
   },

lib/expected/lock1.parseLock.testWithResolverOptions.json

@@ -1,4 +1,5 @@
 {
+  "conflicts": [],
   "manifest": {
     "members": []
   },

lib/expected/lock1.parseLock.testWithSupportedEnvironments.json

@@ -1,4 +1,5 @@
 {
+  "conflicts": [],
   "manifest": {
     "members": []
   },

lib/expected/lock1.parseLock.testWithToolUvDevDeps.json

@@ -1,4 +1,5 @@
 {
+  "conflicts": [],
   "manifest": {
     "members": []
   },

lib/expected/lock1.parseLock.testWorkspace.json

@@ -1,4 +1,5 @@
 {
+  "conflicts": [],
   "manifest": {
     "members": [
       "workspace",

lib/expected/lock1.parseLock.testWorkspaceFlat.json

@@ -1,4 +1,5 @@
 {
+  "conflicts": [],
   "manifest": {
     "members": [
       "pkg-a",

lib/fixtures/conflicts/pyproject.toml

@@ -0,0 +1,36 @@
+[project]
+name = "conflicts"
+version = "0.1.0"
+description = "Add your description here"
+readme = "README.md"
+authors = [
+    { name = "adisbladis", email = "[email protected]" }
+]
+requires-python = ">=3.12"
+dependencies = []
+
+[project.optional-dependencies]
+extra-a = [
+  "arpeggio==2.0.0",
+]
+extra-b = [
+  "arpeggio==2.0.1",
+]
+
+[dependency-groups]
+group-c = [
+  "arpeggio==2.0.0",
+]
+
+[tool.uv]
+conflicts = [
+  [
+    { extra = "extra-a" },
+    { extra = "extra-b" },
+    { group = "group-c" },
+  ],
+]
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"

lib/fixtures/conflicts/src/conflicts/__init__.py

@@ -0,0 +1,2 @@
+def main() -> None:
+    print("Hello from conflicts!")