simplify

Author: basnijholt

unidep/_dependencies_parsing.py

@@ -112,7 +112,7 @@ def _parse_dependency(
     ignore_pins: list[str],
     overwrite_pins: dict[str, str | None],
     skip_dependencies: list[str],
-    origin: Path,
+    origin: tuple[Path, ...],
 ) -> list[Spec]:
     name, pin, selector = parse_package_str(dependency)
     if name in ignore_pins:
@@ -131,10 +131,10 @@ def _parse_dependency(
     identifier_hash = _identifier(identifier, selector)
     if which == "both":
         return [
-            Spec(name, "conda", pin, identifier_hash, selector, origin=(origin,)),
-            Spec(name, "pip", pin, identifier_hash, selector, origin=(origin,)),
+            Spec(name, "conda", pin, identifier_hash, selector, origin=origin),
+            Spec(name, "pip", pin, identifier_hash, selector, origin=origin),
         ]
-    return [Spec(name, which, pin, identifier_hash, selector, origin=(origin,))]
+    return [Spec(name, which, pin, identifier_hash, selector, origin=origin)]
 
 
 class ParsedRequirements(NamedTuple):
@@ -264,7 +264,7 @@ def _update_data_structures(
     path_with_extras: PathWithExtras,
     datas: list[dict[str, Any]],  # modified in place
     all_extras: list[list[str]],  # modified in place
-    seen: set[tuple[PathWithExtras, ...]],  # modified in place
+    seen: set[PathWithExtras],  # modified in place
     yaml: YAML,
     is_nested: bool,
     origin: PathWithExtras | None = None,
@@ -273,10 +273,7 @@ def _update_data_structures(
     if verbose:
         print(f"📄 Parsing `{path_with_extras.path_with_extras}`")
     data = _load(path_with_extras.path, yaml)
-    if origin is None:
-        data["_origin"] = path_with_extras.path
-    else:
-        data["_origin"] = origin.path
+    data["_origin"] = origin or path_with_extras
     datas.append(data)
     _move_local_optional_dependencies_to_local_dependencies(
         data=data,  # modified in place
@@ -297,11 +294,7 @@ def _update_data_structures(
             verbose=verbose,
         )
 
-    seen.add(
-        (origin.resolved(), path_with_extras.resolved())
-        if origin is not None
-        else (path_with_extras.resolved(),),
-    )
+    seen.add(path_with_extras.resolved())
 
     # Handle "local_dependencies" (or old name "includes", changed in 0.42.0)
     for local_dependency in _get_local_dependencies(data):
@@ -318,6 +311,13 @@ def _update_data_structures(
         )
 
 
+def _unique_sorted_resolved(
+    paths: tuple[PathWithExtras, ...],
+) -> tuple[PathWithExtras, ...]:
+    """Return a unique list of paths."""
+    return tuple(sorted({p.resolved() for p in paths}))
+
+
 def _move_optional_dependencies_to_dependencies(
     data: dict[str, Any],
     path_with_extras: PathWithExtras,
@@ -388,7 +388,7 @@ def _add_local_dependencies(
     path_with_extras: PathWithExtras,
     datas: list[dict[str, Any]],
     all_extras: list[list[str]],
-    seen: set[tuple[PathWithExtras, ...]],
+    seen: set[PathWithExtras],
     yaml: YAML,
     verbose: bool = False,
 ) -> None:
@@ -462,7 +462,7 @@ def parse_requirements(
     # `data` and `all_extras` are lists of the same length
     datas: list[dict[str, Any]] = []
     all_extras: list[list[str]] = []
-    seen: set[tuple[PathWithExtras, ...]] = set()
+    seen: set[PathWithExtras] = set()
     yaml = YAML(typ="rt")  # Might be unused if all are TOML files
     for path_with_extras in paths_with_extras:
         _update_data_structures(
@@ -497,7 +497,7 @@ def parse_requirements(
                 ignore_pins,
                 overwrite_pins_map,
                 skip_dependencies,
-                origin=data["_origin"],
+                origin=data["_origin"].resolved().path,
             )
         for opt_name, opt_deps in data.get("optional_dependencies", {}).items():
             if opt_name in _extras or "*" in _extras:
@@ -509,7 +509,7 @@ def parse_requirements(
                     overwrite_pins_map,
                     skip_dependencies,
                     is_optional=True,
-                    origin=data["_origin"],
+                    origin=data["_origin"].resolved().path,
                 )
 
     return ParsedRequirements(
@@ -546,7 +546,7 @@ def _add_dependencies(
     skip_dependencies: list[str],
     *,
     is_optional: bool = False,
-    origin: Path,
+    origin: tuple[Path, ...],
 ) -> int:
     for i, dep in enumerate(dependencies):
         identifier += 1