Extra test

Author: basnijholt

tests/test_unidep.py

@@ -2581,3 +2581,130 @@ def test_optional_dependencies_with_version_specifier(
     )
     assert resolved.keys() == {"adaptive"}
     assert resolved["adaptive"][None]["conda"].pin == "=0.13.2"
+
+
+@pytest.mark.parametrize("toml_or_yaml", ["toml", "yaml"])
+def test_origin_in_spec(
+    tmp_path: Path,
+    toml_or_yaml: Literal["toml", "yaml"],
+) -> None:
+    d1 = tmp_path / "dir1"
+    d1.mkdir()
+    f1 = d1 / "requirements.yaml"
+    f1.write_text("dependencies:\n  - numpy\n  - conda: mumps")
+
+    d2 = tmp_path / "dir2"
+    d2.mkdir()
+    f2 = d2 / "requirements.yaml"
+    f2.write_text("dependencies:\n  - pip: pandas\n  - numpy")
+    f1 = maybe_as_toml(toml_or_yaml, f1)
+    f2 = maybe_as_toml(toml_or_yaml, f2)
+
+    requirements = parse_requirements(f1, f2, verbose=False)
+    assert requirements.requirements == {
+        "numpy": [
+            Spec(
+                name="numpy",
+                which="conda",
+                pin=None,
+                identifier="17e5d607",
+                selector=None,
+                origin=(f1,),
+            ),
+            Spec(
+                name="numpy",
+                which="pip",
+                pin=None,
+                identifier="17e5d607",
+                selector=None,
+                origin=(f1,),
+            ),
+            Spec(
+                name="numpy",
+                which="conda",
+                pin=None,
+                identifier="9e467fa1",
+                selector=None,
+                origin=(f2,),
+            ),
+            Spec(
+                name="numpy",
+                which="pip",
+                pin=None,
+                identifier="9e467fa1",
+                selector=None,
+                origin=(f2,),
+            ),
+        ],
+        "mumps": [
+            Spec(
+                name="mumps",
+                which="conda",
+                pin=None,
+                identifier="5eb93b8c",
+                selector=None,
+                origin=(f1,),
+            ),
+        ],
+        "pandas": [
+            Spec(
+                name="pandas",
+                which="pip",
+                pin=None,
+                identifier="08fd8713",
+                selector=None,
+                origin=(f2,),
+            ),
+        ],
+    }
+
+    resolved = resolve_conflicts(
+        requirements.requirements,
+        requirements.platforms,
+    )
+    assert resolved == {
+        "numpy": {
+            None: {
+                "conda": Spec(
+                    name="numpy",
+                    which="conda",
+                    pin=None,
+                    identifier="17e5d607",
+                    selector=None,
+                    origin=(f1, f2),
+                ),
+                "pip": Spec(
+                    name="numpy",
+                    which="pip",
+                    pin=None,
+                    identifier="17e5d607",
+                    selector=None,
+                    origin=(f1, f2),
+                ),
+            },
+        },
+        "mumps": {
+            None: {
+                "conda": Spec(
+                    name="mumps",
+                    which="conda",
+                    pin=None,
+                    identifier="5eb93b8c",
+                    selector=None,
+                    origin=(f1,),
+                ),
+            },
+        },
+        "pandas": {
+            None: {
+                "pip": Spec(
+                    name="pandas",
+                    which="pip",
+                    pin=None,
+                    identifier="08fd8713",
+                    selector=None,
+                    origin=(f2,),
+                ),
+            },
+        },
+    }

unidep/_conflicts.py

@@ -82,22 +82,32 @@ def _maybe_new_spec_with_combined_pinnings(
     specs: list[Spec],
 ) -> Spec:
     pinned_specs = [m for m in specs if m.pin is not None]
+    combined_origin = tuple(sorted({p for s in specs for p in s.origin}))
     if len(pinned_specs) == 1:
-        return pinned_specs[0]
+        if len(combined_origin) == 1:
+            return pinned_specs[0]
+        # If there is only one pinned spec, but the origins are different,
+        # we need to create a new spec with the combined origin.
+        return pinned_specs[0]._replace(origin=combined_origin)
+
     if len(pinned_specs) > 1:
         first = pinned_specs[0]
         pins = [m.pin for m in pinned_specs]
         pin = combine_version_pinnings(pins, name=first.name)  # type: ignore[arg-type]
-        combined_files = tuple({f for spec in specs for f in (spec.origin or ())})
         return Spec(
             name=first.name,
             which=first.which,
             pin=pin,
             identifier=first.identifier,  # should I create a new one?
-            origin=combined_files,
+            origin=combined_origin,
         )
 
     # Flatten the list
+    assert len(pinned_specs) == 0
+    if len(combined_origin) > 1:
+        # If there are no pinned specs, but the origins are different,
+        # we need to create a new spec with the combined origin.
+        return specs[0]._replace(origin=combined_origin)
     return specs[0]