lerna 2.2.0__tar.gz → 2.2.1__tar.gz

{lerna-2.2.0 → lerna-2.2.1}/Cargo.lock

@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "lerna"
-version = "2.2.0"
+version = "2.2.1"
 dependencies = [
  "rand",
  "serde",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "lerna_py"
-version = "2.2.0"
+version = "2.2.1"
 dependencies = [
  "lerna",
  "pyo3",
@@ -76,9 +76,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.189"
+version = "0.2.190"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"
+checksum = "ce5d3ddc6d3fa000eb1536d85e147bfe31aacaba692ed6a876f95cb7c855be78"
 
 [[package]]
 name = "linked-hash-map"
@@ -118,9 +118,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.29.2"
+version = "0.29.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4688ddedf473e32662b9b067670129a8afb8c18e351482c70d62ba4a88171e8b"
+checksum = "700d18fa267b73b9b521fd7e13580e2f446916f176cacee1ab63fcc8191f1655"
 dependencies = [
  "inventory",
  "libc",
@@ -133,18 +133,18 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.29.2"
+version = "0.29.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f41027e41b4bd03f6e60f9f417fe24a6341a6bb744edd62b6f709f2a52ea30e9"
+checksum = "7b3fc0c4d08f6bb10e71fe39dfb9e2f59c6eb6854e22ec8092f50c69a4499adb"
 dependencies = [
  "target-lexicon",
 ]
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.29.2"
+version = "0.29.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e591a95526fead067432c3b3a33fc74770b87b1e04e73671090d9c2055a2b327"
+checksum = "dfc0b8e19df29aad7086cf977bb0c2a2f143e30567eb113e9cf72b62ca698330"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -152,9 +152,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.29.2"
+version = "0.29.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73225868fc1cd84eef2c3c230ddb91273bf1de46aeb8a4248da76d32a0924a1c"
+checksum = "6100e8a4b5eba53afaa5ed078364851a0b2499c553a44c31026b929049b49dc6"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -164,9 +164,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.29.2"
+version = "0.29.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "571575aa3749fa6216757dd47d2a3e7ef360f329a40f0666a9fbd14889024952"
+checksum = "6143877a16e82b5a727b7127ff4cd86858a24a28d745d72f43e6f227c7b1bdb3"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -331,18 +331,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.57"
+version = "0.8.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d35102a9f36d089ccae9e4c6802bc118be4487b80aaffc0ab4e0cf5ce92d2873"
+checksum = "6400fc4bb7426f6faac3fb07566122bb18622e3022bd2c36426a92ed489b1dbe"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.57"
+version = "0.8.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "146c01f5ab44258da43cf276c74a2763db2ff3969c9c652c3f2de07041d0b2bc"
+checksum = "99c27cc7525bad4df59a45e073c45b2c2aa820efb588234cc23a547ec69a34db"
 dependencies = [
  "proc-macro2",
  "quote",

{lerna-2.2.0 → lerna-2.2.1}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lerna_py"
-version = "2.2.0"
+version = "2.2.1"
 edition = "2021"
 publish = false
 

{lerna-2.2.0 → lerna-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: lerna
-Version: 2.2.0
+Version: 2.2.1
 Summary: Lerna is a framework for elegantly configuring complex applications
 Project-URL: Repository, https://github.com/1kbgz/lerna
 Project-URL: Homepage, https://github.com/1kbgz/lerna

{lerna-2.2.0 → lerna-2.2.1}/lerna/__init__.py

@@ -1,7 +1,7 @@
 # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
 
 # Source of truth for Lerna's version (Hydra-compatible API)
-__version__ = "2.2.0"
+__version__ = "2.2.1"
 
 # Callback support from Rust
 from lerna import lerna as _rust, utils

{lerna-2.2.0 → lerna-2.2.1}/lerna/_internal/core_plugins/importlib_resources_config_source.py

@@ -7,6 +7,7 @@ from typing import Any
 import yaml
 from omegaconf import OmegaConf
 
+from lerna._internal.core_plugins.pkg_helper import pkg_files
 from lerna.core.object_type import ObjectType
 from lerna.plugins.config_source import ConfigLoadError, ConfigResult, ConfigSource
 
@@ -103,6 +104,7 @@ class ImportlibResourcesConfigSource(ConfigSource):
 
     def load_config(self, config_path: str) -> ConfigResult:
         normalized_config_path = self._normalize_file_name(config_path)
+        # Reading a config imports the package as before, so its import side effects still run
         res = resources.files(self.path).joinpath(normalized_config_path)
         if not (self._safe_is_file(res) or self._safe_is_dir(res)):
             raise ConfigLoadError(f"Config not found : {normalized_config_path}")
@@ -111,14 +113,14 @@ class ImportlibResourcesConfigSource(ConfigSource):
 
     def available(self) -> bool:
         try:
-            files = resources.files(self.path)
+            files = pkg_files(self.path)
         except (ValueError, ModuleNotFoundError, TypeError):
             return False
         return any(f.name == "__init__.py" and self._safe_is_file(f) for f in files.iterdir())
 
     def is_group(self, config_path: str) -> bool:
         try:
-            files = resources.files(self.path)
+            files = pkg_files(self.path)
         except (ValueError, ModuleNotFoundError, TypeError):
             return False
 
@@ -128,7 +130,7 @@ class ImportlibResourcesConfigSource(ConfigSource):
     def is_config(self, config_path: str) -> bool:
         config_path = self._normalize_file_name(config_path)
         try:
-            files = resources.files(self.path)
+            files = pkg_files(self.path)
         except (ValueError, ModuleNotFoundError, TypeError):
             return False
         res = files.joinpath(config_path)
@@ -136,7 +138,7 @@ class ImportlibResourcesConfigSource(ConfigSource):
 
     def list(self, config_path: str, results_filter: ObjectType | None) -> list[str]:
         files: list[str] = []
-        for file in resources.files(self.path).joinpath(config_path).iterdir():
+        for file in pkg_files(self.path).joinpath(config_path).iterdir():
             fname = file.name
             fpath = os.path.join(config_path, fname)
             self._list_add_result(

{lerna-2.2.0 → lerna-2.2.1}/lerna/_internal/core_plugins/pkg_helper.py

@@ -5,11 +5,74 @@ Helper functions for pkg:// protocol support using importlib.resources.
 These functions are designed to be passed to RustHybridConfigRepository as callbacks.
 """
 
+from __future__ import annotations
+
+import importlib.util
+import os
+import sys
 from importlib import resources
-from typing import Any
+from importlib.machinery import all_suffixes
+from pathlib import Path
+from typing import TYPE_CHECKING, Any
 
 import yaml
 
+if TYPE_CHECKING:
+    from importlib.abc import Traversable
+
+
+def _has_init(path: str) -> bool:
+    return any(os.path.isfile(os.path.join(path, "__init__" + suffix)) for suffix in all_suffixes())
+
+
+def find_package_dir(module_path: str) -> Path | None:
+    """
+    Locate a regular package's directory without importing it or its parents.
+
+    importlib.resources.files() imports the package, which runs every parent
+    ``__init__`` along the way. Plugin search paths are resolved on every startup,
+    so walk the import path instead, following the path finder's order: a regular
+    package wins, then a module, then namespace portions. Returns None whenever
+    the walk can't give the same answer as an import (zip imports, namespace or
+    already-imported packages, modules shadowing packages); callers then fall back
+    to importlib.
+    """
+    parts = module_path.split(".")
+    if module_path in sys.modules or not all(parts):
+        return None
+    try:
+        spec = importlib.util.find_spec(parts[0])
+    except (ImportError, ValueError):
+        return None
+    if spec is None or spec.submodule_search_locations is None:
+        return None
+    locations = list(spec.submodule_search_locations)
+    for depth, part in enumerate(parts[1:], start=1):
+        parent = sys.modules.get(".".join(parts[:depth]))
+        if parent is not None:
+            locations = list(getattr(parent, "__path__", []))
+        portions = []
+        for location in locations:
+            candidate = os.path.join(location, part)
+            if _has_init(candidate):
+                portions = [candidate]
+                break
+            if any(os.path.isfile(candidate + suffix) for suffix in all_suffixes()):
+                return None
+            if os.path.isdir(candidate):
+                portions.append(candidate)
+        if not portions:
+            return None
+        locations = portions
+    if len(locations) != 1 or not _has_init(locations[0]):
+        return None
+    return Path(locations[0])
+
+
+def pkg_files(module_path: str) -> Traversable:
+    """Return ``importlib.resources.files(module_path)``, without importing the package when possible."""
+    return find_package_dir(module_path) or resources.files(module_path)
+
 
 def load_pkg_config(module_path: str, config_path: str) -> dict[str, Any] | None:
     """
@@ -23,6 +86,7 @@ def load_pkg_config(module_path: str, config_path: str) -> dict[str, Any] | None
         Parsed YAML as dict, or None if the file doesn't exist
     """
     try:
+        # Reading a config imports the package as before, so its import side effects still run
         files = resources.files(module_path)
 
         # Normalize path - add .yaml extension if needed
@@ -55,7 +119,7 @@ def pkg_config_exists(module_path: str, config_path: str) -> bool:
         True if the file exists, False otherwise
     """
     try:
-        files = resources.files(module_path)
+        files = pkg_files(module_path)
 
         # Normalize path - add .yaml extension if needed
         path = config_path
@@ -80,7 +144,7 @@ def pkg_group_exists(module_path: str, group_path: str) -> bool:
         True if the directory exists, False otherwise
     """
     try:
-        files = resources.files(module_path)
+        files = pkg_files(module_path)
         if not group_path:
             # Root of the package
             return True
@@ -102,7 +166,7 @@ def pkg_list_options(module_path: str, group_path: str) -> list[str]:
         List of option names (without .yaml extension)
     """
     try:
-        files = resources.files(module_path)
+        files = pkg_files(module_path)
         if group_path:
             files = files.joinpath(group_path)
 

{lerna-2.2.0 → lerna-2.2.1}/lerna/core/plugins.py

@@ -14,6 +14,7 @@ from typing import Any
 
 from omegaconf import DictConfig
 
+from lerna._internal.core_plugins.pkg_helper import find_package_dir
 from lerna._internal.execution_policy import _trusted_internal_target
 from lerna._internal.sources_registry import SourcesRegistry
 from lerna.core.singleton import Singleton
@@ -303,6 +304,8 @@ def _is_pkg_path_available(pkg_path: str) -> bool:
     """Check whether a pkg:// path refers to an importable Python package."""
     # Convert path separators to dots for importlib
     module_path = pkg_path.replace("/", ".")
+    if find_package_dir(module_path) is not None:
+        return True
     try:
         spec = importlib.util.find_spec(module_path)
         return spec is not None

{lerna-2.2.0 → lerna-2.2.1}/lerna/core/utils.py

@@ -267,7 +267,7 @@ def setup_globals() -> None:
     # please add documentation when you add a new resolver
     OmegaConf.register_new_resolver(
         "now",
-        lambda pattern: datetime.now().strftime(pattern),  # noqa: DTZ005
+        lambda pattern: datetime.now().strftime(pattern),
         use_cache=True,
         replace=True,
     )

lerna-2.2.1/lerna/tests/test_pkg_paths.py

@@ -0,0 +1,96 @@
+import sys
+import zipfile
+from importlib import resources
+from pathlib import Path
+
+import pytest
+
+from lerna._internal.core_plugins.importlib_resources_config_source import ImportlibResourcesConfigSource
+from lerna._internal.core_plugins.pkg_helper import find_package_dir, pkg_config_exists, pkg_files
+from lerna.core.plugins import _is_pkg_path_available
+
+RAISES = "raise RuntimeError('package code should not run')\n"
+
+
+def _write(root: Path, files: dict[str, str]) -> None:
+    for name, content in files.items():
+        path = root / name
+        path.parent.mkdir(parents=True, exist_ok=True)
+        path.write_text(content)
+
+
+@pytest.fixture
+def syspath(tmp_path, monkeypatch):
+    monkeypatch.syspath_prepend(str(tmp_path))
+    before = set(sys.modules)
+    yield tmp_path
+    for name in set(sys.modules) - before:
+        del sys.modules[name]
+
+
+def test_parents_are_not_imported(syspath):
+    _write(syspath, {"heavy/__init__.py": RAISES, "heavy/conf/__init__.py": RAISES, "heavy/conf/db/sqlite.yaml": "driver: sqlite\n"})
+
+    assert find_package_dir("heavy.conf") == syspath / "heavy" / "conf"
+    assert _is_pkg_path_available("heavy/conf")
+    assert pkg_config_exists("heavy.conf", "db/sqlite")
+    source = ImportlibResourcesConfigSource(provider="test", path="pkg://heavy.conf")
+    assert source.available()
+    assert source.is_group("db")
+    assert source.is_config("db/sqlite")
+    assert source.list("db", None) == ["sqlite"]
+    assert "heavy" not in sys.modules
+
+
+def test_reading_a_config_imports_the_package(syspath):
+    _write(syspath, {"sideeffect/__init__.py": "", "sideeffect/conf/__init__.py": "LOADED = True\n", "sideeffect/conf/a.yaml": "a: 1\n"})
+    source = ImportlibResourcesConfigSource(provider="test", path="pkg://sideeffect.conf")
+
+    assert source.is_config("a")
+    assert "sideeffect.conf" not in sys.modules
+    assert source.load_config("a").config == {"a": 1}
+    assert sys.modules["sideeffect.conf"].LOADED
+
+
+def test_namespace_parent(syspath):
+    _write(syspath, {"nsparent/conf/__init__.py": RAISES})
+
+    assert find_package_dir("nsparent.conf") == syspath / "nsparent" / "conf"
+
+
+def test_imported_parent_uses_its_path(syspath):
+    _write(syspath, {"extended/__init__.py": "", "elsewhere/conf/__init__.py": ""})
+    import extended
+
+    extended.__path__.append(str(syspath / "elsewhere"))
+
+    assert find_package_dir("extended.conf") == syspath / "elsewhere" / "conf"
+
+
+@pytest.mark.parametrize(
+    ("files", "module_path"),
+    [
+        ({}, "missing.conf"),
+        ({"shadow/__init__.py": "", "shadow/conf.py": ""}, "shadow.conf"),
+        ({"nsleaf/conf/a.yaml": ""}, "nsleaf.conf"),
+    ],
+)
+def test_unresolved_paths_defer_to_importlib(syspath, files, module_path):
+    _write(syspath, files)
+
+    assert find_package_dir(module_path) is None
+
+
+def test_zip_import_falls_back(tmp_path, monkeypatch):
+    archive = tmp_path / "zipped.zip"
+    with zipfile.ZipFile(archive, "w") as zf:
+        zf.writestr("zipped/__init__.py", "")
+        zf.writestr("zipped/conf/__init__.py", "")
+        zf.writestr("zipped/conf/a.yaml", "a: 1\n")
+    monkeypatch.syspath_prepend(str(archive))
+    try:
+        assert find_package_dir("zipped.conf") is None
+        assert pkg_files("zipped.conf").joinpath("a.yaml").read_text() == resources.files("zipped.conf").joinpath("a.yaml").read_text()
+    finally:
+        for name in [n for n in sys.modules if n == "zipped" or n.startswith("zipped.")]:
+            del sys.modules[name]

{lerna-2.2.0 → lerna-2.2.1}/pyproject.toml

@@ -13,7 +13,7 @@ authors = [
 description = "Lerna is a framework for elegantly configuring complex applications"
 readme = "README.md"
 license = { text = "Apache-2.0" }
-version = "2.2.0"
+version = "2.2.1"
 requires-python = ">=3.10"
 keywords = []
 
@@ -64,13 +64,14 @@ Repository = "https://github.com/1kbgz/lerna"
 Homepage = "https://github.com/1kbgz/lerna"
 
 [tool.bumpversion]
-current_version = "2.2.0"
+current_version = "2.2.1"
 commit = true
 tag = true
 commit_args = "-s"
 pre_commit_hooks = [
     "cargo update --workspace",
-    "git add Cargo.lock",
+    "cargo update --manifest-path rust/Cargo.toml --workspace",
+    "git add Cargo.lock rust/Cargo.lock",
 ]
 
 [[tool.bumpversion.files]]
@@ -135,13 +136,6 @@ exclude_also = [
 ignore_errors = true
 fail_under = 50
 
-[tool.hatch.build]
-artifacts = [
-    "lerna/*.dll",
-    "lerna/*.dylib",
-    "lerna/*.so",
-]
-
 [tool.hatch.build.sources]
 src = "/"
 
@@ -160,12 +154,21 @@ packages = [
     "Cargo.lock",
 ]
 exclude = [
+    "*.dll",
+    "*.dylib",
+    "*.so",
+    "*.pyd",
     "examples",
     "rust/Makefile",
     "target",
 ]
 
 [tool.hatch.build.targets.wheel]
+artifacts = [
+    "lerna/*.dll",
+    "lerna/*.dylib",
+    "lerna/*.so",
+]
 packages = [
     "lerna",
     "hydra_plugins",

{lerna-2.2.0 → lerna-2.2.1}/rust/Cargo.lock

@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "lerna"
-version = "2.2.0"
+version = "2.2.1"
 dependencies = [
  "rand",
  "serde",
@@ -87,9 +87,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.189"
+version = "0.2.190"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"
+checksum = "ce5d3ddc6d3fa000eb1536d85e147bfe31aacaba692ed6a876f95cb7c855be78"
 
 [[package]]
 name = "linked-hash-map"
@@ -319,18 +319,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.57"
+version = "0.8.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d35102a9f36d089ccae9e4c6802bc118be4487b80aaffc0ab4e0cf5ce92d2873"
+checksum = "6400fc4bb7426f6faac3fb07566122bb18622e3022bd2c36426a92ed489b1dbe"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.57"
+version = "0.8.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "146c01f5ab44258da43cf276c74a2763db2ff3969c9c652c3f2de07041d0b2bc"
+checksum = "99c27cc7525bad4df59a45e073c45b2c2aa820efb588234cc23a547ec69a34db"
 dependencies = [
  "proc-macro2",
  "quote",

{lerna-2.2.0 → lerna-2.2.1}/rust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lerna"
-version = "2.2.0"
+version = "2.2.1"
 authors = ["the lerna authors <dev@1kbgz.com>"]
 edition = "2021"
 license = "Apache-2.0"