omegaconf 2.4.0.dev12__tar.gz → 2.4.0.dev14__tar.gz

{omegaconf-2.4.0.dev12/omegaconf.egg-info → omegaconf-2.4.0.dev14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omegaconf
-Version: 2.4.0.dev12
+Version: 2.4.0.dev14
 Summary: A flexible configuration library
 Home-page: https://github.com/omry/omegaconf
 Author: Omry Yadan
@@ -22,19 +22,16 @@ Requires-Dist: PyYAML>=5.1.0; extra == "dev"
 Requires-Dist: sphinx; extra == "dev"
 Requires-Dist: sphinx-tabs; extra == "dev"
 Requires-Dist: attrs; extra == "dev"
-Requires-Dist: black[jupyter]==26.3.1; extra == "dev"
 Requires-Dist: build; extra == "dev"
 Requires-Dist: bump-my-version; extra == "dev"
 Requires-Dist: coveralls; extra == "dev"
-Requires-Dist: flake8==7.3.0; extra == "dev"
-Requires-Dist: isort==5.13.2; extra == "dev"
 Requires-Dist: nox[pbs]; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
-Requires-Dist: pyflakes; extra == "dev"
 Requires-Dist: pyrefly==0.62.0; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-benchmark; extra == "dev"
 Requires-Dist: pytest-mock; extra == "dev"
+Requires-Dist: ruff==0.15.22; extra == "dev"
 Requires-Dist: towncrier; extra == "dev"
 Requires-Dist: twine; extra == "dev"
 Requires-Dist: pydevd; extra == "dev"

omegaconf-2.4.0.dev14/build_helpers/__init__.py

@@ -0,0 +1,5 @@
+# ruff: noqa: F401, I001
+
+# Order of imports is important (see warning otherwise when running tests)
+import setuptools
+import distutils

{omegaconf-2.4.0.dev12 → omegaconf-2.4.0.dev14}/build_helpers/get_vendored.py

@@ -6,10 +6,12 @@ from itertools import chain
 from pathlib import Path
 from typing import Callable, FrozenSet, Generator, List, Set, Tuple, Union
 
-WHITELIST = {'README.txt', '__init__.py', 'vendor.txt'}
+WHITELIST = {"README.txt", "__init__.py", "vendor.txt"}
 
 
-def delete_all(*paths: Path, whitelist: Union[Set[str], FrozenSet[str]] = frozenset()) -> None:
+def delete_all(
+    *paths: Path, whitelist: Union[Set[str], FrozenSet[str]] = frozenset()
+) -> None:
     """Clear all the items in each of the indicated paths, except for elements listed
     in the whitelist"""
     for item in paths:
@@ -34,13 +36,15 @@ def iter_subtree(path: Path, depth: int = 0) -> Generator[Tuple[Path, int], None
 
 def patch_vendor_imports(file: Path, replacements: List[Callable[[str], str]]) -> None:
     """Apply a list of replacements/patches to a given file"""
-    text = file.read_text('utf8')
+    text = file.read_text("utf8")
     for replacement in replacements:
         text = replacement(text)
-    file.write_text(text, 'utf8')
+    file.write_text(text, "utf8")
 
 
-def find_vendored_libs(vendor_dir: Path, whitelist: Set[str]) -> Tuple[List[str], List[Path]]:
+def find_vendored_libs(
+    vendor_dir: Path, whitelist: Set[str]
+) -> Tuple[List[str], List[Path]]:
     vendored_libs = []
     paths = []
     for item in vendor_dir.iterdir():
@@ -56,23 +60,31 @@ def find_vendored_libs(vendor_dir: Path, whitelist: Set[str]) -> Tuple[List[str]
 
 def vendor(vendor_dir: Path, relative_imports: bool = False) -> None:
     # target package is <parent>.<vendor_dir>; foo/vendor -> foo.vendor
-    pkgname = f'{vendor_dir.parent.name}.{vendor_dir.name}'
+    pkgname = f"{vendor_dir.parent.name}.{vendor_dir.name}"
 
     # remove everything
     delete_all(*vendor_dir.iterdir(), whitelist=WHITELIST)
 
     # install with pip
-    subprocess.run([
-        'pip', 'install', '-t', str(vendor_dir),
-        '-r', str(vendor_dir / 'vendor.txt'),
-        '--no-compile', '--no-deps'
-    ])
+    subprocess.run(
+        [
+            "pip",
+            "install",
+            "-t",
+            str(vendor_dir),
+            "-r",
+            str(vendor_dir / "vendor.txt"),
+            "--no-compile",
+            "--no-deps",
+        ]
+    )
 
     # delete stuff that's not needed
     delete_all(
-        *vendor_dir.glob('*.dist-info'),
-        *vendor_dir.glob('*.egg-info'),
-        vendor_dir / 'bin')
+        *vendor_dir.glob("*.dist-info"),
+        *vendor_dir.glob("*.egg-info"),
+        vendor_dir / "bin",
+    )
 
     vendored_libs, paths = find_vendored_libs(vendor_dir, WHITELIST)
 
@@ -81,41 +93,45 @@ def vendor(vendor_dir: Path, relative_imports: bool = False) -> None:
         for lib in vendored_libs:
             replacements += (
                 partial(  # import bar -> import foo.vendor.bar
-                    re.compile(r'(^\s*)import {}\n'.format(lib), flags=re.M).sub,
-                    r'\1from {} import {}\n'.format(pkgname, lib)
+                    re.compile(r"(^\s*)import {}\n".format(lib), flags=re.M).sub,
+                    r"\1from {} import {}\n".format(pkgname, lib),
                 ),
                 partial(  # from bar -> from foo.vendor.bar
-                    re.compile(r'(^\s*)from {}(\.|\s+)'.format(lib), flags=re.M).sub,
-                    r'\1from {}.{}\2'.format(pkgname, lib)
+                    re.compile(r"(^\s*)from {}(\.|\s+)".format(lib), flags=re.M).sub,
+                    r"\1from {}.{}\2".format(pkgname, lib),
                 ),
             )
 
     for file, depth in chain.from_iterable(map(iter_subtree, paths)):
         if relative_imports:
-            pkgname = '.' * (depth - 1)
+            pkgname = "." * (depth - 1)
             replacements = []
             for lib in vendored_libs:
                 replacements += (
                     partial(
-                        re.compile(r'(^\s*)import {}\n'.format(lib), flags=re.M).sub,
-                        r'\1from {} import {}\n'.format(pkgname, "")
+                        re.compile(r"(^\s*)import {}\n".format(lib), flags=re.M).sub,
+                        r"\1from {} import {}\n".format(pkgname, ""),
                     ),
                     partial(
-                        re.compile(r'^from {}(\s+)'.format(lib), flags=re.M).sub,
-                        r'from .{}\1'.format(pkgname)
+                        re.compile(r"^from {}(\s+)".format(lib), flags=re.M).sub,
+                        r"from .{}\1".format(pkgname),
                     ),
                     partial(
-                        re.compile(r'(^\s*)from {}(\.+)'.format(lib), flags=re.M).sub,
-                        r'\1from {}\2'.format(pkgname)
+                        re.compile(r"(^\s*)from {}(\.+)".format(lib), flags=re.M).sub,
+                        r"\1from {}\2".format(pkgname),
                     ),
                 )
         patch_vendor_imports(file, replacements)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     # this assumes this is a script in `build_helpers`
-    here = Path('__file__').resolve().parent
-    vendor_dir = here / 'omegaconf' / 'vendor'
-    assert (vendor_dir / 'vendor.txt').exists(), 'omegaconf/vendor/vendor.txt file not found'
-    assert (vendor_dir / '__init__.py').exists(), 'omegaconf/vendor/__init__.py file not found'
+    repo_root = Path(__file__).resolve().parent.parent
+    vendor_dir = repo_root / "omegaconf" / "vendor"
+    assert (vendor_dir / "vendor.txt").exists(), (
+        "omegaconf/vendor/vendor.txt file not found"
+    )
+    assert (vendor_dir / "__init__.py").exists(), (
+        "omegaconf/vendor/__init__.py file not found"
+    )
     vendor(vendor_dir, relative_imports=True)

{omegaconf-2.4.0.dev12 → omegaconf-2.4.0.dev14}/omegaconf/__init__.py

@@ -1,4 +1,4 @@
-from .base import Container, DictKeyType, ListMergeMode, Node, SCMode, UnionNode
+from .base import Container, DictKeyType, Node, SCMode, UnionNode
 from .dictconfig import DictConfig
 from .errors import (
     KeyValidationError,
@@ -30,6 +30,7 @@ from .omegaconf import (
     open_dict,
     read_write,
 )
+from .tupleconfig import TupleConfig
 from .typing import Antlr4ParserRuleContext
 from .version import __version__
 
@@ -43,12 +44,12 @@ __all__ = [
     "Container",
     "UnionNode",
     "ListConfig",
+    "TupleConfig",
     "DictConfig",
     "DictKeyType",
     "OmegaConf",
     "Resolver",
     "SCMode",
-    "ListMergeMode",
     "flag_override",
     "read_write",
     "open_dict",

{omegaconf-2.4.0.dev12 → omegaconf-2.4.0.dev14}/omegaconf/_impl.py

@@ -1,13 +1,18 @@
 from typing import Any
 
-from omegaconf import Container, DictConfig, ListConfig, Node, ValueNode
-from omegaconf.errors import ConfigKeyError, ConfigTypeError
+from omegaconf import Container, DictConfig, ListConfig, Node, TupleConfig, ValueNode
+from omegaconf.errors import (
+    ConfigKeyError,
+    ConfigTypeError,
+    InterpolationToMissingValueError,
+)
 from omegaconf.nodes import InterpolationResultNode
 
 from ._utils import (
     _DEFAULT_MARKER_,
     _ensure_container,
     _get_value,
+    _is_missing_literal,
     is_primitive_container,
     is_structured_config,
 )
@@ -26,8 +31,19 @@ def _resolve_container_value(cfg: Container, key: Any) -> None:
                 resolved_value
             ):
                 resolved = _ensure_container(resolved_value)
+        if isinstance(cfg, TupleConfig) and _is_missing_literal(_get_value(resolved)):
+            cfg._format_and_raise(
+                key=key,
+                value=_get_value(resolved),
+                cause=InterpolationToMissingValueError(
+                    "TupleConfig interpolation resolved to a missing value"
+                ),
+            )
         if isinstance(resolved, Container) and isinstance(node, ValueNode):
-            cfg[key] = resolved
+            if isinstance(cfg, TupleConfig):
+                cfg._set_item_for_resolution(key, resolved)
+            else:
+                cfg[key] = resolved
         else:
             node._set_value(_get_value(resolved))
     else:
@@ -44,7 +60,7 @@ def _resolve(cfg: Node) -> Node:
         for k in list(cfg.keys()):
             _resolve_container_value(cfg, k)
 
-    elif isinstance(cfg, ListConfig):
+    elif isinstance(cfg, (ListConfig, TupleConfig)):
         for i in range(len(cfg)):
             _resolve_container_value(cfg, i)