dependence 1.2.1__py3-none-any.whl → 1.2.5__py3-none-any.whl

dependence/_utilities.py

@@ -7,8 +7,6 @@ import re
 import shutil
 import sys
 from collections import deque
-from collections.abc import Container, Hashable, Iterable, MutableSet
-from collections.abc import Set as AbstractSet
 from configparser import ConfigParser, SectionProxy
 from enum import Enum, auto
 from glob import iglob
@@ -22,8 +20,8 @@ from subprocess import DEVNULL, PIPE, CalledProcessError, list2cmdline, run
 from traceback import format_exception
 from typing import (
     IO,
+    TYPE_CHECKING,
     Any,
-    Callable,
     TypedDict,
     cast,
     overload,
@@ -35,6 +33,18 @@ from jsonpointer import resolve_pointer  # type: ignore
 from packaging.requirements import InvalidRequirement, Requirement
 from packaging.utils import canonicalize_name
 
+if TYPE_CHECKING:
+    from collections.abc import (
+        Callable,
+        Container,
+        Hashable,
+        Iterable,
+        MutableSet,
+    )
+    from collections.abc import (
+        Set as AbstractSet,
+    )
+
 _BUILTIN_DISTRIBUTION_NAMES: tuple[str] = ("distribute",)
 _UNSAFE_CHARACTERS_PATTERN: re.Pattern = re.compile("[^A-Za-z0-9.]+")
 
@@ -1246,7 +1256,7 @@ def _iter_requirement_names(
             yield from _iter_requirement_names(
                 requirement_,
                 exclude=cast(
-                    MutableSet[str],
+                    "MutableSet[str]",
                     exclude
                     | (
                         lateral_exclude - {_get_requirement_name(requirement_)}

dependence/freeze.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import argparse
 import os
-from collections.abc import Iterable, MutableSet
 from fnmatch import fnmatch
 from functools import partial
 from itertools import chain
@@ -21,6 +20,7 @@ from dependence._utilities import (
 )
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable, MutableSet
     from importlib.metadata import Distribution
 
 _DO_NOT_PIN_DISTRIBUTION_NAMES: MutableSet[str] = {
@@ -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.rstrip()
         distribution_names: MutableSet[str] = {name}
         if (depth_ is None) or depth_:
             distribution_names |= get_required_distribution_names(
@@ -254,7 +277,7 @@ def _iter_frozen_requirements(
                 depth=None if (depth_ is None) else depth_ - 1,
             )
         return cast(
-            MutableSet[str],
+            "MutableSet[str]",
             distribution_names - exclude,
         )
 

dependence/update.py

@@ -13,7 +13,6 @@ from typing import (
     IO,
     TYPE_CHECKING,
     Any,
-    Callable,
 )
 
 import tomli
@@ -35,7 +34,7 @@ from dependence._utilities import (
 )
 
 if TYPE_CHECKING:
-    from collections.abc import Iterable
+    from collections.abc import Callable, Iterable
     from importlib.metadata import Distribution
 
 

dependence/upgrade.py

@@ -27,6 +27,7 @@ def upgrade(
     exclude: Iterable[str] = (),
     exclude_recursive: Iterable[str] = (),
     depth: int | None = None,
+    echo: bool = False,
 ) -> None:
     """
     This function obtains a list of dependencies for the specified
@@ -72,20 +73,22 @@ def upgrade(
         requirements,
         exclude=exclude,
         exclude_recursive=exclude_recursive,
+        keep_version_specifier="*",
         no_version="*",
         depth=depth,
         include_pointers=include_pointers,
         exclude_pointers=exclude_pointers,
     )
-    command: tuple[str, ...] = (
-        sys.executable,
-        "-m",
-        "pip",
-        "install",
-        "--upgrade",
-        *frozen_requirements,
-    )
-    check_output(command)
+    if frozen_requirements:
+        command: tuple[str, ...] = (
+            sys.executable,
+            "-m",
+            "pip",
+            "install",
+            "--upgrade",
+            *frozen_requirements,
+        )
+        check_output(command, echo=echo)
     configuration_files: tuple[str, ...] = tuple(
         chain(
             *map(iter_configuration_files, requirements)  # type: ignore

{dependence-1.2.1.dist-info → dependence-1.2.5.dist-info}/METADATA

@@ -1,19 +1,19 @@
 Metadata-Version: 2.4
 Name: dependence
-Version: 1.2.1
+Version: 1.2.5
 Summary: A dependency management tool for python projects
 Project-URL: Documentation, https://dependence.enorganic.org
 Project-URL: Repository, https://github.com/enorganic/dependence
 Author-email: david@belais.me
 License-Expression: MIT
 Keywords: dependencies,requirements
-Requires-Python: ~=3.9
+Requires-Python: ~=3.10
 Requires-Dist: jsonpointer
 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
@@ -59,7 +59,7 @@ For example, in [this project's Makefile
 
 ```Makefile
 SHELL := bash
-PYTHON_VERSION := 3.9
+PYTHON_VERSION := 3.10
 
 upgrade:
     hatch run dependence upgrade\

dependence-1.2.5.dist-info/RECORD

@@ -0,0 +1,11 @@
+dependence/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dependence/__main__.py,sha256=gsluad-hgMvktrflSNLEMB3F-G_BKvlIGTHL0c1aQd8,1822
+dependence/_utilities.py,sha256=tcDRdDNdxeZHmqqHD7tynNSQYfZ9RWp0b7JiKfw88jE,39070
+dependence/freeze.py,sha256=ybjHOQOzxtuVjJQOUr1077CoMGSGdho3iKj8waygwuQ,17516
+dependence/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dependence/update.py,sha256=KGNj-COhRnbxGVAUikBKdUgJCz0xZ741Z6HEBny7diQ,20852
+dependence/upgrade.py,sha256=nyOahgBJayeVeicM4AJ72lp2uDMvJOcCNUZIhVKk1do,7882
+dependence-1.2.5.dist-info/METADATA,sha256=app1ZrC3g853fvygMzm15hHB4CaCpfMnxnuHS8TZ6kg,8366
+dependence-1.2.5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+dependence-1.2.5.dist-info/entry_points.txt,sha256=NStO_B0D81ObVYr9zDs6LCy0whm0a8KCiiFHMmTwOVE,56
+dependence-1.2.5.dist-info/RECORD,,

{dependence-1.2.1.dist-info → dependence-1.2.5.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any

dependence-1.2.1.dist-info/RECORD

@@ -1,11 +0,0 @@
-dependence/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dependence/__main__.py,sha256=gsluad-hgMvktrflSNLEMB3F-G_BKvlIGTHL0c1aQd8,1822
-dependence/_utilities.py,sha256=-9RGMsQKzaA-fEDswdXSx1LAVKdasWuKQGl7jgTeZXs,38960
-dependence/freeze.py,sha256=dW3m2zEf2l61GWKdQTgrvj8FCDINU6GahmKr5ViIKX4,16226
-dependence/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dependence/update.py,sha256=043Hsj8bQJypJ_p_dxSl8HXBwlGoUK238OFYThTWVos,20856
-dependence/upgrade.py,sha256=lNovLvKhxiczZAJj2_hHrbkDscNOTrx1xaOhmobVNSI,7747
-dependence-1.2.1.dist-info/METADATA,sha256=HWFQjpA3poRTZLCAqNHgDf36iVrYDZmD0PrDQinQLtw,8364
-dependence-1.2.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dependence-1.2.1.dist-info/entry_points.txt,sha256=NStO_B0D81ObVYr9zDs6LCy0whm0a8KCiiFHMmTwOVE,56
-dependence-1.2.1.dist-info/RECORD,,