omegaconf 2.4.0.dev10__tar.gz → 2.4.0.dev11__tar.gz

{omegaconf-2.4.0.dev10 → omegaconf-2.4.0.dev11}/MANIFEST.in

@@ -1,5 +1,7 @@
 include LICENSE
 include requirements/base.txt
+include requirements/dev.txt
+include requirements/docs.txt
 recursive-include tests *.py *.pickle
 recursive-include build_helpers *.py *.jar
 recursive-include omegaconf *.g4

{omegaconf-2.4.0.dev10/omegaconf.egg-info → omegaconf-2.4.0.dev11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omegaconf
-Version: 2.4.0.dev10
+Version: 2.4.0.dev11
 Summary: A flexible configuration library
 Home-page: https://github.com/omry/omegaconf
 Author: Omry Yadan
@@ -17,6 +17,27 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: PyYAML>=5.1.0
+Provides-Extra: dev
+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: towncrier; extra == "dev"
+Requires-Dist: twine; extra == "dev"
+Requires-Dist: pydevd; extra == "dev"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -25,6 +46,7 @@ Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
 Dynamic: license-file
+Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
@@ -33,8 +55,9 @@ Dynamic: summary
 |  | Description |
 | --- | --- |
 | Project | [![PyPI version](https://badge.fury.io/py/omegaconf.svg)](https://badge.fury.io/py/omegaconf)[![Downloads](https://pepy.tech/badge/omegaconf/month)](https://pepy.tech/project/omegaconf)![Python](https://img.shields.io/badge/python-3.10%20%7C%203.11%20%7C%203.12%20%7C%203.13%20%7C%203.14-blue) |
-| Code quality| [![CircleCI](https://img.shields.io/circleci/build/github/omry/omegaconf?logo=s&token=5de2f8dc2a0dd78438520575431aa533150806e3)](https://circleci.com/gh/omry/omegaconf)[![Coverage Status](https://coveralls.io/repos/github/omry/omegaconf/badge.svg)](https://coveralls.io/github/omry/omegaconf)|
-| Docs and support |[![Documentation Status](https://readthedocs.org/projects/omegaconf/badge/?version=2.0_branch)](https://omegaconf.readthedocs.io/en/2.1_branch/)[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/omry/omegaconf/master?filepath=docs%2Fnotebook%2FTutorial.ipynb)|
+| Code quality| [![CircleCI](https://dl.circleci.com/status-badge/img/gh/omry/omegaconf/tree/main.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/omry/omegaconf/tree/main)[![Coverage Status](https://coveralls.io/repos/github/omry/omegaconf/badge.svg)](https://coveralls.io/github/omry/omegaconf)|
+| Docs and support |[![Documentation Status](https://readthedocs.org/projects/omegaconf/badge/?version=2.0_branch)](https://omegaconf.readthedocs.io/en/2.3_branch/)[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/omry/omegaconf/master?filepath=docs%2Fnotebook%2FTutorial.ipynb)[![Zulip chat](https://img.shields.io/badge/chat-Zulip-2e77d0?logo=zulip)](https://hydra-framework.zulipchat.com/)|
+| Backlog | [Issues & PRs backlog](https://omry.github.io/omegaconf/) |
 
 
 OmegaConf is a hierarchical configuration system, with support for merging configurations from multiple sources (YAML config files, dataclasses/objects and CLI arguments)
@@ -51,6 +74,8 @@ OmegaConf 2.4.0.dev is the upcoming development version.
 * [Documentation](https://omegaconf.readthedocs.io/en/latest/)
 * [Source code](https://github.com/omry/omegaconf/tree/master)
 
+Install with `pip install --upgrade --pre omegaconf`
+
 ### Stable (2.3)
 OmegaConf 2.3 is the current stable version.
 * [What's new](https://github.com/omry/omegaconf/releases/tag/v2.3.0)
@@ -58,6 +83,3 @@ OmegaConf 2.3 is the current stable version.
 * [Source code](https://github.com/omry/omegaconf/tree/2.3_branch)
 
 Install with `pip install --upgrade omegaconf`
-
-## Live tutorial
-Run the live tutorial: [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/omry/omegaconf/master?filepath=docs%2Fnotebook%2FTutorial.ipynb)

{omegaconf-2.4.0.dev10 → omegaconf-2.4.0.dev11}/README.md

@@ -2,8 +2,9 @@
 |  | Description |
 | --- | --- |
 | Project | [![PyPI version](https://badge.fury.io/py/omegaconf.svg)](https://badge.fury.io/py/omegaconf)[![Downloads](https://pepy.tech/badge/omegaconf/month)](https://pepy.tech/project/omegaconf)![Python](https://img.shields.io/badge/python-3.10%20%7C%203.11%20%7C%203.12%20%7C%203.13%20%7C%203.14-blue) |
-| Code quality| [![CircleCI](https://img.shields.io/circleci/build/github/omry/omegaconf?logo=s&token=5de2f8dc2a0dd78438520575431aa533150806e3)](https://circleci.com/gh/omry/omegaconf)[![Coverage Status](https://coveralls.io/repos/github/omry/omegaconf/badge.svg)](https://coveralls.io/github/omry/omegaconf)|
-| Docs and support |[![Documentation Status](https://readthedocs.org/projects/omegaconf/badge/?version=2.0_branch)](https://omegaconf.readthedocs.io/en/2.1_branch/)[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/omry/omegaconf/master?filepath=docs%2Fnotebook%2FTutorial.ipynb)|
+| Code quality| [![CircleCI](https://dl.circleci.com/status-badge/img/gh/omry/omegaconf/tree/main.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/omry/omegaconf/tree/main)[![Coverage Status](https://coveralls.io/repos/github/omry/omegaconf/badge.svg)](https://coveralls.io/github/omry/omegaconf)|
+| Docs and support |[![Documentation Status](https://readthedocs.org/projects/omegaconf/badge/?version=2.0_branch)](https://omegaconf.readthedocs.io/en/2.3_branch/)[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/omry/omegaconf/master?filepath=docs%2Fnotebook%2FTutorial.ipynb)[![Zulip chat](https://img.shields.io/badge/chat-Zulip-2e77d0?logo=zulip)](https://hydra-framework.zulipchat.com/)|
+| Backlog | [Issues & PRs backlog](https://omry.github.io/omegaconf/) |
 
 
 OmegaConf is a hierarchical configuration system, with support for merging configurations from multiple sources (YAML config files, dataclasses/objects and CLI arguments)
@@ -20,6 +21,8 @@ OmegaConf 2.4.0.dev is the upcoming development version.
 * [Documentation](https://omegaconf.readthedocs.io/en/latest/)
 * [Source code](https://github.com/omry/omegaconf/tree/master)
 
+Install with `pip install --upgrade --pre omegaconf`
+
 ### Stable (2.3)
 OmegaConf 2.3 is the current stable version.
 * [What's new](https://github.com/omry/omegaconf/releases/tag/v2.3.0)
@@ -27,6 +30,3 @@ OmegaConf 2.3 is the current stable version.
 * [Source code](https://github.com/omry/omegaconf/tree/2.3_branch)
 
 Install with `pip install --upgrade omegaconf`
-
-## Live tutorial
-Run the live tutorial: [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/omry/omegaconf/master?filepath=docs%2Fnotebook%2FTutorial.ipynb)

{omegaconf-2.4.0.dev10 → omegaconf-2.4.0.dev11}/build_helpers/build_helpers.py

@@ -7,7 +7,7 @@ import subprocess
 import sys
 from functools import partial
 from pathlib import Path
-from typing import List, Optional
+from typing import Any, ClassVar, List, Optional
 
 from setuptools import Command
 from setuptools.command import build_py, develop, sdist
@@ -17,7 +17,7 @@ class ANTLRCommand(Command):  # type: ignore  # pragma: no cover
     """Generate parsers using ANTLR."""
 
     description = "Run ANTLR"
-    user_options: List[str] = []
+    user_options: ClassVar[Any] = []
 
     def run(self) -> None:
         """Run command."""
@@ -100,7 +100,7 @@ class CleanCommand(Command):  # type: ignore  # pragma: no cover
 
     description = "Cleans out generated and junk files we don't want in the repo"
     dry_run: bool
-    user_options: List[str] = []
+    user_options: ClassVar[Any] = []
 
     def run(self) -> None:
         root = Path(__file__).parent.parent.absolute()
@@ -211,7 +211,7 @@ def matches(patterns: List[str], path: Path) -> bool:
     return False
 
 
-def run_antlr(cmd: Command) -> None:  # pragma: no cover
+def run_antlr(cmd: Any) -> None:  # pragma: no cover
     try:
         cmd.announce("Generating parsers with antlr4", level=distutils.log.INFO)
         cmd.run_command("antlr")

{omegaconf-2.4.0.dev10 → omegaconf-2.4.0.dev11}/build_helpers/get_vendored.py

@@ -76,8 +76,8 @@ def vendor(vendor_dir: Path, relative_imports: bool = False) -> None:
 
     vendored_libs, paths = find_vendored_libs(vendor_dir, WHITELIST)
 
+    replacements: List[Callable[[str], str]] = []
     if not relative_imports:
-        replacements: List[Callable[[str], str]] = []
         for lib in vendored_libs:
             replacements += (
                 partial(  # import bar -> import foo.vendor.bar

{omegaconf-2.4.0.dev10 → omegaconf-2.4.0.dev11}/omegaconf/__init__.py

@@ -15,6 +15,7 @@ from .nodes import (
     EnumNode,
     FloatNode,
     IntegerNode,
+    LiteralNode,
     PathNode,
     StringNode,
     ValueNode,
@@ -61,6 +62,7 @@ __all__ = [
     "BooleanNode",
     "EnumNode",
     "FloatNode",
+    "LiteralNode",
     "MISSING",
     "SI",
     "II",

{omegaconf-2.4.0.dev10 → omegaconf-2.4.0.dev11}/omegaconf/_impl.py

@@ -1,7 +1,7 @@
 from typing import Any
 
-from omegaconf import MISSING, Container, DictConfig, ListConfig, Node, ValueNode
-from omegaconf.errors import ConfigTypeError, InterpolationToMissingValueError
+from omegaconf import Container, DictConfig, ListConfig, Node, ValueNode
+from omegaconf.errors import ConfigKeyError, ConfigTypeError
 from omegaconf.nodes import InterpolationResultNode
 
 from ._utils import (
@@ -17,23 +17,19 @@ def _resolve_container_value(cfg: Container, key: Any) -> None:
     node = cfg._get_child(key)
     assert isinstance(node, Node)
     if node._is_interpolation():
-        try:
-            resolved = node._dereference_node()
-        except InterpolationToMissingValueError:
-            node._set_value(MISSING)
+        resolved = node._dereference_node()
+        if isinstance(resolved, Container):
+            _resolve(resolved)
+        if isinstance(resolved, InterpolationResultNode):
+            resolved_value = _get_value(resolved)
+            if is_primitive_container(resolved_value) or is_structured_config(
+                resolved_value
+            ):
+                resolved = _ensure_container(resolved_value)
+        if isinstance(resolved, Container) and isinstance(node, ValueNode):
+            cfg[key] = resolved
         else:
-            if isinstance(resolved, Container):
-                _resolve(resolved)
-            if isinstance(resolved, InterpolationResultNode):
-                resolved_value = _get_value(resolved)
-                if is_primitive_container(resolved_value) or is_structured_config(
-                    resolved_value
-                ):
-                    resolved = _ensure_container(resolved_value)
-            if isinstance(resolved, Container) and isinstance(node, ValueNode):
-                cfg[key] = resolved
-            else:
-                node._set_value(_get_value(resolved))
+            node._set_value(_get_value(resolved))
     else:
         _resolve(node)
 
@@ -41,15 +37,11 @@ def _resolve_container_value(cfg: Container, key: Any) -> None:
 def _resolve(cfg: Node) -> Node:
     assert isinstance(cfg, Node)
     if cfg._is_interpolation():
-        try:
-            resolved = cfg._dereference_node()
-        except InterpolationToMissingValueError:
-            cfg._set_value(MISSING)
-        else:
-            cfg._set_value(resolved._value())
+        resolved = cfg._dereference_node()
+        cfg._set_value(resolved._value())
 
     if isinstance(cfg, DictConfig):
-        for k in cfg.keys():
+        for k in list(cfg.keys()):
             _resolve_container_value(cfg, k)
 
     elif isinstance(cfg, ListConfig):
@@ -102,7 +94,11 @@ def select_node(
         if not absolute_key and not key.startswith("."):
             key = f".{key}"
 
-        cfg, key = cfg._resolve_key_and_root(key)
+        try:
+            cfg, key = cfg._resolve_key_and_root(key)
+        except ConfigKeyError:
+            return None
+
         _root, _last_key, node = cfg._select_impl(
             key,
             throw_on_missing=throw_on_missing,