dependence 1.2.6__tar.gz → 1.2.7__tar.gz

{dependence-1.2.6 → dependence-1.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dependence
-Version: 1.2.6
+Version: 1.2.7
 Summary: A dependency management tool for python projects
 Project-URL: Documentation, https://dependence.enorganic.org
 Project-URL: Repository, https://github.com/enorganic/dependence

{dependence-1.2.6 → dependence-1.2.7}/dependence/freeze.py

@@ -268,7 +268,27 @@ def _iter_frozen_requirements(
         if keep_version_specifier and any(
             fnmatch(name, pattern) for pattern in keep_version_specifier
         ):
-            distribution_names_specifiers[name] = requirement_string.rstrip()
+            existing_requirement_string: str | None = (
+                distribution_names_specifiers.get(name)
+            )
+            requirement_string = requirement_string.rstrip()
+            # Prioritize requirement strings which don't include environment
+            # markers over those that do, and prefer more specific requirement
+            # strings (longer ones) over less specific requirement strings
+            if (
+                (not existing_requirement_string)
+                or (
+                    (";" in existing_requirement_string)
+                    == (";" in requirement_string)
+                    and len(existing_requirement_string)
+                    < len(requirement_string)
+                )
+                or (
+                    ";" in existing_requirement_string
+                    and ";" not in requirement_string
+                )
+            ):
+                distribution_names_specifiers[name] = requirement_string
         distribution_names: MutableSet[str] = {name}
         if (depth_ is None) or depth_:
             distribution_names |= get_required_distribution_names(
@@ -306,6 +326,7 @@ def freeze(
     depth: int | None = None,
     include_pointers: tuple[str, ...] = (),
     exclude_pointers: tuple[str, ...] = (),
+    keep_version_specifier: Iterable[str] = (),
 ) -> None:
     """
     Print the (frozen) requirements for one or more specified requirements or
@@ -343,6 +364,7 @@ def freeze(
                 depth=depth,
                 include_pointers=include_pointers,
                 exclude_pointers=exclude_pointers,
+                keep_version_specifier=keep_version_specifier,
             )
         )
     )
@@ -413,6 +435,18 @@ def main() -> None:
             "value must be single-quoted if it contains wildcards)"
         ),
     )
+    parser.add_argument(
+        "-kvs",
+        "--keep-version-specifier",
+        type=str,
+        default=[],
+        action="append",
+        help=(
+            "Don't freeze versions (instead retain the most specific version "
+            "specifier) for packages matching this/these glob pattern(s) "
+            "(note: the value must be single-quoted if it contains wildcards)"
+        ),
+    )
     parser.add_argument(
         "-do",
         "--dependency-order",
@@ -461,6 +495,7 @@ def main() -> None:
             iter_parse_delimited_values(namespace.exclude_recursive)
         ),
         no_version=namespace.no_version,
+        keep_version_specifier=namespace.keep_version_specifier,
         dependency_order=namespace.dependency_order,
         depth=namespace.depth,
         include_pointers=tuple(namespace.include_pointer),

{dependence-1.2.6 → dependence-1.2.7}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "dependence"
-version = "1.2.6"
+version = "1.2.7"
 description = "A dependency management tool for python projects"
 readme = "README.md"
 license = "MIT"