lerna 2.1.1__tar.gz → 2.2.1__tar.gz

{lerna-2.1.1 → lerna-2.2.1}/.gitignore

@@ -160,5 +160,7 @@ emsdk
 # AI
 ROADMAP.md
 AGENTS.md
+CHANGES.md
+/hydra/
 .github/hooks/sdlc.json
 .superpowers

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

@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "lerna"
-version = "2.1.1"
+version = "2.2.1"
 dependencies = [
  "rand",
  "serde",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "lerna_py"
-version = "2.1.1"
+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.1.1 → lerna-2.2.1}/Cargo.toml

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: lerna
-Version: 2.1.1
+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
@@ -19,8 +19,7 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Programming Language :: Rust
 Requires-Python: >=3.10
-Requires-Dist: omegaconf<2.4,>=2.2.3
-Requires-Dist: packaging
+Requires-Dist: omegaconf<3,>=2.2.3
 Provides-Extra: develop
 Requires-Dist: build; extra == 'develop'
 Requires-Dist: bump-my-version; extra == 'develop'
@@ -32,6 +31,7 @@ Requires-Dist: hatchling; extra == 'develop'
 Requires-Dist: hydra-core; extra == 'develop'
 Requires-Dist: mdformat; extra == 'develop'
 Requires-Dist: mdformat-tables>=1; extra == 'develop'
+Requires-Dist: packaging; extra == 'develop'
 Requires-Dist: pytest; extra == 'develop'
 Requires-Dist: pytest-cov; extra == 'develop'
 Requires-Dist: ruff; extra == 'develop'
@@ -364,7 +364,7 @@ defaults:
 ```python
 from lerna import compose_with_provenance, initialize_config_dir
 
-with initialize_config_dir(config_dir="conf", version_base=None):
+with initialize_config_dir(config_dir="conf"):
   result = compose_with_provenance("config", overrides=["gateway.modules=append(metrics)"])
 
 print(result.config)                         # unresolved DictConfig

{lerna-2.1.1 → lerna-2.2.1}/README.md

@@ -321,7 +321,7 @@ defaults:
 ```python
 from lerna import compose_with_provenance, initialize_config_dir
 
-with initialize_config_dir(config_dir="conf", version_base=None):
+with initialize_config_dir(config_dir="conf"):
   result = compose_with_provenance("config", overrides=["gateway.modules=append(metrics)"])
 
 print(result.config)                         # unresolved DictConfig

{lerna-2.1.1 → 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.1.1"
+__version__ = "2.2.1"
 
 # Callback support from Rust
 from lerna import lerna as _rust, utils

{lerna-2.1.1 → lerna-2.2.1}/lerna/_internal/config_repository.py

@@ -2,7 +2,6 @@
 import copy
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
-from textwrap import dedent
 
 from omegaconf import (
     Container,
@@ -14,13 +13,11 @@ from omegaconf import (
     read_write,
 )
 
-from lerna import version
 from lerna.core.config_search_path import ConfigSearchPath
 from lerna.core.object_type import ObjectType
 from lerna.plugins.config_source import ConfigResult, ConfigSource
 
 from ..core.default_element import ConfigDefault, GroupDefault, InputDefault, PatchDefault
-from .deprecation_warning import deprecation_warning
 from .sources_registry import SourcesRegistry
 
 try:
@@ -166,25 +163,10 @@ class ConfigRepository(IConfigRepository):
         config_path: str,
         defaults: ListConfig,
     ) -> list[InputDefault]:
-        def issue_deprecated_name_warning() -> None:
-            # DEPRECATED: remove in 1.2
-            url = "https://hydra.cc/docs/1.2/upgrades/1.0_to_1.1/changes_to_package_header"
-            deprecation_warning(
-                message=dedent(
-                    f"""\
-                    In {config_path}: Defaults List contains deprecated keyword _name_, see {url}
-                    """
-                ),
-            )
-
         res: list[InputDefault] = []
         for item in defaults._iter_ex(resolve=False):
             default: InputDefault
             if isinstance(item, DictConfig):
-                if not version.base_at_least("1.2"):
-                    old_optional = None
-                    if len(item) > 1 and "optional" in item:
-                        old_optional = item.pop("optional")
                 keys = list(item.keys())
 
                 if len(keys) > 1:
@@ -232,23 +214,10 @@ class ConfigRepository(IConfigRepository):
                 keywords = ConfigRepository.Keywords()
                 self._extract_keywords_from_config_group(config_path, config_group, keywords)
 
-                if not version.base_at_least("1.2") and not keywords.optional and old_optional is not None:
-                    keywords.optional = old_optional
-
                 node = item._get_node(key)
                 assert node is not None and isinstance(node, Node)
                 config_value = node._value()
 
-                if not version.base_at_least("1.2") and old_optional is not None:
-                    msg = dedent(
-                        f"""
-                            In {config_path}: 'optional: true' is deprecated.
-                            Use 'optional {key}: {config_value}' instead.
-                            Support for the old style is removed for Hydra version_base >= 1.2"""
-                    )
-
-                    deprecation_warning(msg)
-
                 if config_value is not None and not isinstance(config_value, (str, list)):
                     raise ValueError(f"Unsupported item value in defaults : {type(config_value).__name__}. Supported: string or list")
 
@@ -263,9 +232,6 @@ class ConfigRepository(IConfigRepository):
                         options.append(vv)
                     config_value = options
 
-                if not version.base_at_least("1.2") and package is not None and "_name_" in package:
-                    issue_deprecated_name_warning()
-
                 default = GroupDefault(
                     group=keywords.group,
                     value=config_value,
@@ -276,9 +242,6 @@ class ConfigRepository(IConfigRepository):
 
             elif isinstance(item, str):
                 path, package, _package2 = self._split_group(item)
-                if not version.base_at_least("1.2") and package is not None and "_name_" in package:
-                    issue_deprecated_name_warning()
-
                 default = ConfigDefault(path=path, package=package)
             else:
                 raise ValueError(f"Unsupported type in defaults : {type(item).__name__}")  # noqa: TRY004
@@ -331,6 +294,8 @@ class ConfigRepository(IConfigRepository):
                 keywords.optional = True
             elif keyword == "override":
                 keywords.override = True
+        if keywords.optional and keywords.override:
+            raise ValueError(f"In {config_path}: 'optional' and 'override' keywords cannot be combined in defaults list")
         keywords.group = group
 
 

{lerna-2.1.1 → lerna-2.2.1}/lerna/_internal/core_plugins/basic_launcher.py

@@ -52,7 +52,11 @@ class BasicLauncher(Launcher):
         assert self.config is not None
         assert self.task_function is not None
 
-        configure_log(self.config.hydra.hydra_logging, self.config.hydra.verbose)
+        configure_log(
+            self.config.hydra.hydra_logging,
+            self.config.hydra.verbose,
+            execution_whitelist=self.hydra_context.execution_whitelist,
+        )
         sweep_dir = self.config.hydra.sweep.dir
         Path(str(sweep_dir)).mkdir(parents=True, exist_ok=True)
         log.info(f"Launching {len(job_overrides)} jobs locally")
@@ -73,5 +77,9 @@ class BasicLauncher(Launcher):
                 job_subdir_key="hydra.sweep.subdir",
             )
             runs.append(ret)
-            configure_log(self.config.hydra.hydra_logging, self.config.hydra.verbose)
+            configure_log(
+                self.config.hydra.hydra_logging,
+                self.config.hydra.verbose,
+                execution_whitelist=self.hydra_context.execution_whitelist,
+            )
         return runs

{lerna-2.1.1 → 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.1.1 → 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.1.1 → lerna-2.2.1}/lerna/_internal/defaults_list.py

@@ -9,7 +9,7 @@ from textwrap import dedent
 
 from omegaconf import DictConfig, ListConfig, OmegaConf
 
-from lerna import MissingConfigException, version
+from lerna import MissingConfigException
 from lerna._internal.config_repository import IConfigRepository
 from lerna.core.config_store import ConfigStore
 from lerna.core.default_element import (
@@ -26,8 +26,6 @@ from lerna.core.override_parser.overrides_parser import OverridesParser
 from lerna.core.override_parser.types import ListOperationType, Override, OverrideType, ValueType
 from lerna.errors import ConfigCompositionException
 
-from .deprecation_warning import deprecation_warning
-
 # Try to import Rust bindings
 try:
     import lerna.lerna as _rs
@@ -562,13 +560,7 @@ def _update_overrides(
         else:
             d.update_parent(parent.get_group_path(), parent.get_final_package())
 
-        legacy_hydra_override = False
-        if isinstance(d, GroupDefault):
-            assert d.group is not None
-            if not version.base_at_least("1.2"):
-                legacy_hydra_override = not d.is_override() and d.group.startswith("hydra/")
-
-        if seen_override and not (d.is_override() or d.is_external_append() or legacy_hydra_override):
+        if seen_override and not (d.is_override() or d.is_external_append()):
             assert isinstance(last_override_seen, GroupDefault)
             pcp = parent.get_config_path()
             okey = last_override_seen.get_override_key()
@@ -582,35 +574,21 @@ def _update_overrides(
                 )
             )
 
-        if isinstance(d, GroupDefault):
-            if legacy_hydra_override:
-                d.override = True
-                url = "https://hydra.cc/docs/1.2/upgrades/1.0_to_1.1/defaults_list_override"
-                msg = dedent(
-                    f"""\
-                    In {parent.get_config_path()}: Invalid overriding of {d.group}:
-                    Default list overrides requires 'override' keyword.
-                    See {url} for more information.
-                    """
-                )
-                deprecation_warning(msg)
-
-            if d.override:
-                if not legacy_hydra_override:
-                    seen_override = True
-                last_override_seen = d
-                if interpolated_subtree:
-                    # Since interpolations are deferred for until all the config groups are already set,
-                    # Their subtree may not contain config group overrides
-                    raise ConfigCompositionException(
-                        dedent(
-                            f"""\
-                            {parent.get_config_path()}: Default List Overrides are not allowed in the subtree
-                            of an in interpolated config group (override {d.get_override_key()}={d.get_name()}).
-                            """
-                        )
+        if isinstance(d, GroupDefault) and d.override:
+            seen_override = True
+            last_override_seen = d
+            if interpolated_subtree:
+                # Since interpolations are deferred for until all the config groups are already set,
+                # Their subtree may not contain config group overrides
+                raise ConfigCompositionException(
+                    dedent(
+                        f"""\
+                        {parent.get_config_path()}: Default List Overrides are not allowed in the subtree
+                        of an in interpolated config group (override {d.get_override_key()}={d.get_name()}).
+                        """
                     )
-                overrides.add_override(parent.get_config_path(), d)
+                )
+            overrides.add_override(parent.get_config_path(), d)
 
 
 def _has_config_content(cfg: DictConfig) -> bool:

{lerna-2.1.1 → lerna-2.2.1}/lerna/_internal/deprecation_warning.py

@@ -5,9 +5,9 @@ import warnings
 from lerna.errors import HydraDeprecationError
 
 
-def deprecation_warning(message: str, stacklevel: int = 1) -> None:
+def deprecation_warning(message: str, stacklevel: int = 1, category: type[Warning] = UserWarning) -> None:
     warnings_as_errors = os.environ.get("HYDRA_DEPRECATION_WARNINGS_AS_ERRORS")
     if warnings_as_errors:
         raise HydraDeprecationError(message)
     else:
-        warnings.warn(message, stacklevel=stacklevel + 1)
+        warnings.warn(message, category=category, stacklevel=stacklevel + 1)