dependence 1.2.1__tar.gz → 1.2.2__tar.gz

{dependence-1.2.1 → dependence-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dependence
-Version: 1.2.1
+Version: 1.2.2
 Summary: A dependency management tool for python projects
 Project-URL: Documentation, https://dependence.enorganic.org
 Project-URL: Repository, https://github.com/enorganic/dependence
@@ -13,7 +13,7 @@ Requires-Dist: packaging
 Requires-Dist: pip
 Requires-Dist: setuptools>63
 Requires-Dist: tomli-w~=1.2
-Requires-Dist: tomli~=2.2
+Requires-Dist: tomli~=2.3
 Description-Content-Type: text/markdown
 
 # dependence

{dependence-1.2.1 → dependence-1.2.2}/dependence/freeze.py

@@ -81,6 +81,7 @@ def get_frozen_requirements(  # noqa: C901
     *,
     exclude: Iterable[str] = (),
     exclude_recursive: Iterable[str] = (),
+    keep_version_specifier: Iterable[str] = (),
     no_version: Iterable[str] = (),
     dependency_order: bool = False,
     reverse: bool = False,
@@ -101,8 +102,14 @@ def get_frozen_requirements(  # noqa: C901
         exclude_recursive: One or more distributions to exclude/ignore.
             Note: Excluding a distribution here excludes all requirements which
             would be identified through recursion.
+        keep_version_specifier: Keep the original (non-frozen) version
+            specifier for package names matching any of these patterns. This
+            supercedes `no_version`, if both sets of patterns match a package
+            name.
         no_version: Exclude version numbers from the output
-            (only return distribution names)
+            (only return distribution names). This is superceded by
+            `keep_version_specifier`, if both sets of patterns match a package
+            name.
         dependency_order: Sort requirements so that dependents
             precede dependencies
         depth: Depth of recursive requirement discovery
@@ -119,6 +126,10 @@ def get_frozen_requirements(  # noqa: C901
         no_version = (no_version,)
     elif not isinstance(no_version, tuple):
         no_version = tuple(no_version)
+    if isinstance(keep_version_specifier, str):
+        keep_version_specifier = (keep_version_specifier,)
+    elif not isinstance(keep_version_specifier, tuple):
+        keep_version_specifier = tuple(keep_version_specifier)
     # Separate requirement strings from requirement files
     configuration_files: dict[str, dict[str, tuple[str, ...]]] = {}
     requirement_strings: MutableSet[str] = set()
@@ -191,6 +202,7 @@ def get_frozen_requirements(  # noqa: C901
             ),
             exclude_recursive=set(map(normalize_name, exclude_recursive)),
             no_version=no_version,
+            keep_version_specifier=keep_version_specifier,
             depth=depth,
         )
     if dependency_order:
@@ -217,13 +229,20 @@ def _iter_frozen_requirements(
     exclude_recursive: MutableSet[str],
     no_version: Iterable[str] = (),
     depth: int | None = None,
+    keep_version_specifier: Iterable[str] = (),
 ) -> Iterable[str]:
-    def get_requirement_string(distribution_name: str) -> str | None:
-        def distribution_name_matches_pattern(pattern: str) -> bool:
-            return fnmatch(distribution_name, pattern)
+    # This retains a mapping of distribution names to their original
+    # requirement strings in order to return those which match
+    # `keep_version_specifier` patterns with their original specifiers
+    distribution_names_specifiers: dict[str, str] = {}
 
+    def get_requirement_string(distribution_name: str) -> str | None:
+        if distribution_names_specifiers and (
+            distribution_name in distribution_names_specifiers
+        ):
+            return distribution_names_specifiers[distribution_name]
         if (distribution_name in _DO_NOT_PIN_DISTRIBUTION_NAMES) or any(
-            map(distribution_name_matches_pattern, no_version)
+            fnmatch(distribution_name, pattern) for pattern in no_version
         ):
             return distribution_name
         distribution: Distribution
@@ -246,6 +265,10 @@ def _iter_frozen_requirements(
         )
         if name in exclude_recursive:
             return set()
+        if keep_version_specifier and any(
+            fnmatch(name, pattern) for pattern in keep_version_specifier
+        ):
+            distribution_names_specifiers[name] = requirement_string
         distribution_names: MutableSet[str] = {name}
         if (depth_ is None) or depth_:
             distribution_names |= get_required_distribution_names(

{dependence-1.2.1 → dependence-1.2.2}/dependence/upgrade.py

@@ -72,6 +72,7 @@ def upgrade(
         requirements,
         exclude=exclude,
         exclude_recursive=exclude_recursive,
+        keep_version_specifier="*",
         no_version="*",
         depth=depth,
         include_pointers=include_pointers,

{dependence-1.2.1 → dependence-1.2.2}/pyproject.toml

@@ -1,22 +1,29 @@
 [build-system]
-requires = ["hatchling"]
+requires = [
+    "hatchling",
+]
 build-backend = "hatchling.build"
 
 [project]
 name = "dependence"
-version = "1.2.1"
+version = "1.2.2"
 description = "A dependency management tool for python projects"
 readme = "README.md"
 license = "MIT"
 requires-python = "~=3.9"
-authors = [{ email = "david@belais.me" }]
-keywords = ["dependencies", "requirements"]
+authors = [
+    { email = "david@belais.me" },
+]
+keywords = [
+    "dependencies",
+    "requirements",
+]
 dependencies = [
     "packaging",
     "pip",
     "setuptools>63",
     "tomli-w~=1.2",
-    "tomli~=2.2",
+    "tomli~=2.3",
     "jsonpointer",
 ]
 
@@ -28,21 +35,31 @@ Documentation = "https://dependence.enorganic.org"
 Repository = "https://github.com/enorganic/dependence"
 
 [tool.hatch.build.targets.sdist]
-packages = ["src/dependence"]
+packages = [
+    "src/dependence",
+]
 
 [tool.hatch.build.targets.sdist.sources]
 src = ""
 
 [tool.hatch.build.targets.wheel]
-packages = ["src/dependence"]
+packages = [
+    "src/dependence",
+]
 
 [tool.hatch.build.targets.wheel.sources]
 src = ""
 
 [tool.hatch.envs.default]
 python = "3.9"
-dependencies = ["mypy", "pytest", "ruff"]
-pre-install-commands = ["uv pip install --upgrade pip setuptools"]
+dependencies = [
+    "mypy",
+    "pytest",
+    "ruff",
+]
+pre-install-commands = [
+    "uv pip install --upgrade pip setuptools",
+]
 post-install-commands = [
     "hatch run mypy --install-types --non-interactive || echo",
 ]
@@ -50,25 +67,55 @@ post-install-commands = [
 [tool.hatch.envs.docs]
 template = "docs"
 python = "3.13"
-dependencies = ["mkdocs-material", "mkdocstrings[python]", "black"]
+dependencies = [
+    "mkdocs-material",
+    "mkdocstrings[python]",
+    "black",
+]
 
 [tool.hatch.envs.hatch-static-analysis]
 skip-install = false
 
 [tool.hatch.envs.hatch-test]
 template = "hatch-test"
-extra-dependencies = ["ruff", "mypy", "flake8", "tox", "black"]
-extra-arguments = ["--cache-clear"]
+extra-dependencies = [
+    "ruff",
+    "mypy",
+    "flake8",
+    "tox",
+    "black",
+]
+extra-arguments = [
+    "--cache-clear",
+]
 
 [[tool.hatch.envs.hatch-test.matrix]]
-python = ["3.9", "3.10", "3.11", "3.12", "3.13"]
+python = [
+    "3.9",
+    "3.10",
+    "3.11",
+    "3.12",
+    "3.13",
+]
 
 [tool.ruff]
 line-length = 79
 
 [tool.ruff.lint]
-ignore = ["F842", "INP001"]
-extend-select = ["E", "F", "UP", "B", "SIM", "I", "C", "N"]
+ignore = [
+    "F842",
+    "INP001",
+]
+extend-select = [
+    "E",
+    "F",
+    "UP",
+    "B",
+    "SIM",
+    "I",
+    "C",
+    "N",
+]
 
 [tool.ruff.lint.mccabe]
 max-complexity = 10
@@ -79,21 +126,38 @@ docstring-code-line-length = 20
 
 [tool.black]
 line-length = 79
-target-version = ["py39", "py310", "py311", "py312", "py313"]
+target-version = [
+    "py39",
+    "py310",
+    "py311",
+    "py312",
+    "py313",
+]
 
 [tool.mypy]
 python_version = "3.9"
-files = ["src", "tests"]
-exclude = ["tests/test_projects"]
+files = [
+    "src",
+    "tests",
+]
+exclude = [
+    "tests/test_projects",
+]
 disallow_untyped_defs = true
 disallow_incomplete_defs = true
 
 [tool.coverage.run]
-include = ["src/**/*.py"]
-omit = ["src/**/_*.py"]
+include = [
+    "src/**/*.py",
+]
+omit = [
+    "src/**/_*.py",
+]
 
 [tool.coverage.paths]
-source = ["src/**"]
+source = [
+    "src/**",
+]
 
 [tool.coverage.report]
 fail_under = 70