dependence 1.1.1__tar.gz → 1.1.3__tar.gz

{dependence-1.1.1 → dependence-1.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dependence
-Version: 1.1.1
+Version: 1.1.3
 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.1.1 → dependence-1.1.3}/dependence/_utilities.py

@@ -95,6 +95,44 @@ def _undefined() -> Undefined:
     return UNDEFINED
 
 
+cache: Any
+try:
+    from functools import cache  # type: ignore
+except ImportError:
+    from functools import lru_cache
+
+    cache = lru_cache(maxsize=None)
+
+
+def as_tuple(
+    user_function: Callable[..., Iterable[Any]],
+) -> Callable[..., tuple[Any, ...]]:
+    """
+    This is a decorator which will return an iterable as a tuple.
+    """
+
+    def wrapper(*args: Any, **kwargs: Any) -> tuple[Any, ...]:
+        return tuple(user_function(*args, **kwargs) or ())
+
+    return functools.update_wrapper(wrapper, user_function)
+
+
+def as_cached_tuple(
+    maxsize: int | None = None, *, typed: bool = False
+) -> Callable[[Callable[..., Iterable[Any]]], Callable[..., tuple[Any, ...]]]:
+    """
+    This is a decorator which will return an iterable as a tuple,
+    and cache that tuple.
+
+    Parameters:
+
+    - maxsize (int|None) = None: The maximum number of items to cache.
+    - typed (bool) = False: For class methods, should the cache be distinct for
+      sub-classes?
+    """
+    return functools.lru_cache(maxsize=maxsize, typed=typed)(as_tuple)
+
+
 def iter_distinct(items: Iterable[Hashable]) -> Iterable:
     """
     Yield distinct elements, preserving order
@@ -418,14 +456,8 @@ def iter_configuration_files(path: str | Path) -> Iterable[Path | str]:
             yield path
 
 
-class _EditablePackageMetadata(TypedDict):
-    name: str
-    version: str
-    editable_project_location: str
-
-
 def _iter_editable_distribution_locations() -> Iterable[tuple[str, str]]:
-    metadata: _EditablePackageMetadata
+    metadata: _PackageMetadata
     for metadata in json.loads(
         check_output(
             (
@@ -453,10 +485,38 @@ def get_editable_distributions_locations() -> dict[str, str]:
     return dict(_iter_editable_distribution_locations())
 
 
+class _PackageMetadata(TypedDict, total=False):
+    name: str
+    version: str
+    editable_project_location: str
+
+
+@cache
+def map_pip_list() -> dict[str, _PackageMetadata]:
+    names_package_metadata: dict[str, _PackageMetadata] = {}
+    package_metadata: _PackageMetadata
+    for package_metadata in json.loads(
+        check_output(
+            (
+                sys.executable,
+                "-m",
+                "pip",
+                "list",
+                "--format=json",
+            )
+        )
+    ):
+        names_package_metadata[normalize_name(package_metadata["name"])] = (
+            package_metadata
+        )
+    return names_package_metadata
+
+
 def cache_clear() -> None:
     """
     Clear distribution metadata caches
     """
+    map_pip_list.cache_clear()
     get_installed_distributions.cache_clear()
     get_editable_distributions_locations.cache_clear()
     is_editable.cache_clear()
@@ -482,7 +542,13 @@ def get_installed_distributions() -> dict[str, Distribution]:
     refresh_editable_distributions()
     installed: dict[str, Distribution] = {}
     for distribution in _get_distributions():
-        installed[normalize_name(distribution.metadata["Name"])] = distribution
+        name: str = distribution.metadata["Name"]
+        if distribution.version is None:
+            # If no version can be found, use pip to find the version
+            distribution.metadata["Version"] = (
+                map_pip_list().get(name, {}).get("version")
+            )
+        installed[normalize_name(name)] = distribution
     return installed
 
 
@@ -975,6 +1041,10 @@ def _get_requirement_name(requirement: Requirement) -> str:
     return normalize_name(requirement.name)
 
 
+@deprecated(
+    "dependence._utilities.install_requirement is deprecated and will be "
+    "removed in a future release."
+)
 def install_requirement(requirement: str | Requirement) -> None:
     """
     Install a requirement
@@ -1079,31 +1149,15 @@ def _install_requirement(
     cache_clear()
 
 
-def _get_requirement_distribution(
-    requirement: Requirement,
+def _get_installed_distribution(
     name: str,
-    *,
-    reinstall: bool = True,
-    echo: bool = False,
 ) -> Distribution | None:
     if name in _BUILTIN_DISTRIBUTION_NAMES:
         return None
     try:
         return get_installed_distributions()[name]
     except KeyError:
-        if not reinstall:
-            raise
-        if echo:
-            warn(
-                f'The required distribution "{name}" was not installed, '
-                "attempting to install it now...",
-                stacklevel=2,
-            )
-        # Attempt to install the requirement...
-        install_requirement(requirement)
-        return _get_requirement_distribution(
-            requirement, name, reinstall=False, echo=echo
-        )
+        return None
 
 
 def _iter_distribution_requirements(
@@ -1140,9 +1194,7 @@ def _iter_requirement_names(
     # Ensure we don't follow the same requirement again, causing cyclic
     # recursion
     exclude.add(name)
-    distribution: Distribution | None = _get_requirement_distribution(
-        requirement, name, echo=echo
-    )
+    distribution: Distribution | None = _get_installed_distribution(name)
     if distribution is None:
         return ()
     requirements: tuple[Requirement, ...] = tuple(

{dependence-1.1.1 → dependence-1.1.3}/dependence/freeze.py

@@ -1,11 +1,10 @@
 from __future__ import annotations
 
 import argparse
+import os
 from collections.abc import Iterable, MutableSet
 from fnmatch import fnmatch
 from functools import partial
-from importlib.metadata import Distribution
-from importlib.metadata import distribution as _get_distribution
 from itertools import chain
 from pathlib import Path
 from typing import TYPE_CHECKING, cast
@@ -14,7 +13,6 @@ from dependence._utilities import (
     get_distribution,
     get_required_distribution_names,
     get_requirement_string_distribution_name,
-    install_requirement,
     iter_configuration_file_requirement_strings,
     iter_configuration_files,
     iter_distinct,
@@ -22,6 +20,9 @@ from dependence._utilities import (
     normalize_name,
 )
 
+if TYPE_CHECKING:
+    from importlib.metadata import Distribution
+
 _DO_NOT_PIN_DISTRIBUTION_NAMES: MutableSet[str] = {
     "importlib-metadata",
     "importlib-resources",
@@ -119,7 +120,7 @@ def get_frozen_requirements(  # noqa: C901
     elif not isinstance(no_version, tuple):
         no_version = tuple(no_version)
     # Separate requirement strings from requirement files
-    configuration_files: MutableSet[str] = set()
+    configuration_files: dict[str, dict[str, tuple[str, ...]]] = {}
     requirement_strings: MutableSet[str] = set()
     requirement: str | Path
     for requirement in requirements:
@@ -129,21 +130,38 @@ def get_frozen_requirements(  # noqa: C901
             iter_configuration_files(requirement)
         )
         if requirement_configuration_files:
-            configuration_files |= requirement_configuration_files
+            is_directory: bool = os.path.isdir(requirement)
+            for (
+                requirement_configuration_file
+            ) in requirement_configuration_files:
+                configuration_files[requirement_configuration_file] = (
+                    {"include_pointers": ("/project",)}
+                    if (
+                        is_directory
+                        and os.path.basename(
+                            requirement_configuration_file
+                        ).lower()
+                        == "pyproject.toml"
+                    )
+                    else {
+                        "include_pointers": include_pointers,
+                        "exclude_pointers": exclude_pointers,
+                    }
+                )
         else:
             if requirement.startswith("setup.py"):
                 raise ValueError(requirement)
             requirement_strings.add(requirement)
+    configuration_file: str
+    kwargs: dict[str, tuple[str, ...]]
     frozen_requirements: Iterable[str] = iter_distinct(
         chain(
             requirement_strings,
-            *map(
-                partial(
-                    iter_configuration_file_requirement_strings,
-                    include_pointers=include_pointers,
-                    exclude_pointers=exclude_pointers,
-                ),
-                configuration_files,
+            *(
+                iter_configuration_file_requirement_strings(
+                    configuration_file, **kwargs
+                )
+                for configuration_file, kwargs in configuration_files.items()
             ),
         )
     )
@@ -200,7 +218,7 @@ def _iter_frozen_requirements(
     no_version: Iterable[str] = (),
     depth: int | None = None,
 ) -> Iterable[str]:
-    def get_requirement_string(distribution_name: str) -> str:
+    def get_requirement_string(distribution_name: str) -> str | None:
         def distribution_name_matches_pattern(pattern: str) -> bool:
             return fnmatch(distribution_name, pattern)
 
@@ -212,9 +230,11 @@ def _iter_frozen_requirements(
         try:
             distribution = get_distribution(distribution_name)
         except KeyError:
+            # If the distribution is not installed, skip it
+            return None
             # If the distribution is missing, install it
-            install_requirement(distribution_name)
-            distribution = _get_distribution(distribution_name)
+            # install_requirement(distribution_name)
+            # distribution = _get_distribution(distribution_name)
         return f"{distribution.metadata['Name']}=={distribution.version}"
 
     def get_required_distribution_names_(
@@ -249,7 +269,7 @@ def _iter_frozen_requirements(
             )
         ),
     )
-    return map(get_requirement_string, requirements)
+    return filter(None, map(get_requirement_string, requirements))
 
 
 def freeze(

{dependence-1.1.1 → dependence-1.1.3}/dependence/update.py

@@ -133,10 +133,18 @@ def _get_updated_requirement_string(
         return requirement_string
     try:
         distribution: Distribution = get_installed_distributions()[name]
+        if distribution.version is None:
+            return requirement_string
         _update_requirement_specifiers(requirement, distribution.version)
     except KeyError:
         # If the requirement isn't installed, we can't update the version
         pass
+    except TypeError as error:
+        message: str = (
+            f"Unable to determine installed version for {requirement_string}: "
+            f"{distribution!r}"
+        )
+        raise ValueError(message) from error
     return str(requirement)
 
 

{dependence-1.1.1 → dependence-1.1.3}/pyproject.toml

@@ -1,23 +1,16 @@
 [build-system]
-requires = [
-    "hatchling",
-]
+requires = ["hatchling"]
 build-backend = "hatchling.build"
 
 [project]
 name = "dependence"
-version = "1.1.1"
+version = "1.1.3"
 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",
@@ -35,31 +28,17 @@ Documentation = "https://dependence.enorganic.org"
 Repository = "https://github.com/enorganic/dependence"
 
 [tool.hatch.build.targets.sdist]
-packages = [
-    "src/dependence",
-]
-sources = [
-    "src",
-]
+packages = ["src/dependence"]
+sources = ["src"]
 
 [tool.hatch.build.targets.wheel]
-packages = [
-    "src/dependence",
-]
-sources = [
-    "src",
-]
+packages = ["src/dependence"]
+sources = ["src"]
 
 [tool.hatch.envs.default]
 python = "3.9"
-dependencies = [
-    "mypy",
-    "pytest",
-    "ruff",
-]
-pre-install-commands = [
-    "pip install --upgrade pip setuptools",
-]
+dependencies = ["mypy", "pytest", "ruff"]
+pre-install-commands = ["pip install --upgrade pip setuptools"]
 post-install-commands = [
     "hatch run mypy --install-types --non-interactive || echo",
 ]
@@ -70,11 +49,7 @@ lint = "ruff check . && ruff format --check . && mypy"
 [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
@@ -82,37 +57,17 @@ skip-install = false
 [tool.hatch.envs.hatch-test]
 template = "hatch-test"
 extra-dependencies = []
-extra-arguments = [
-    "--cache-clear",
-]
+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
@@ -123,38 +78,21 @@ 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