omegaconf 2.4.0.dev4__tar.gz → 2.4.0.dev10__tar.gz

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

@@ -1,12 +1,11 @@
 Metadata-Version: 2.4
 Name: omegaconf
-Version: 2.4.0.dev4
+Version: 2.4.0.dev10
 Summary: A flexible configuration library
 Home-page: https://github.com/omry/omegaconf
 Author: Omry Yadan
 Author-email: omry@yadan.net
 Keywords: yaml configuration config
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -14,12 +13,10 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: PyYAML>=5.1.0
-Requires-Dist: dataclasses; python_version == "3.6"
-Requires-Dist: typing-extensions; python_version <= "3.9"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -35,16 +32,25 @@ Dynamic: summary
 # OmegaConf
 |  | 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?versions=1.4.*&versions=2.0.*&versions=2.1.*)![PyPI - Python Version](https://img.shields.io/pypi/pyversions/omegaconf.svg) |
-| 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)[![Total alerts](https://img.shields.io/lgtm/alerts/g/omry/omegaconf.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/omry/omegaconf/alerts/)[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/omry/omegaconf.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/omry/omegaconf/context:python)|
+| 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)|
 
 
 OmegaConf is a hierarchical configuration system, with support for merging configurations from multiple sources (YAML config files, dataclasses/objects and CLI arguments)
 providing a consistent API regardless of how the configuration was created.
 
+## Optional subprojects
+
+- [`omegaconf-pydevd`](./subprojects/omegaconf-pydevd/README.md): optional `pydevd` debugger plugin for inspecting OmegaConf objects in supported debuggers.
+
 ## Releases
 
+### Upcoming (2.4.0.dev)
+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)
+
 ### Stable (2.3)
 OmegaConf 2.3 is the current stable version.
 * [What's new](https://github.com/omry/omegaconf/releases/tag/v2.3.0)
@@ -53,33 +59,5 @@ OmegaConf 2.3 is the current stable version.
 
 Install with `pip install --upgrade omegaconf`
 
-### Previous release (2.2)
-
-* [What's new](https://github.com/omry/omegaconf/releases/tag/v2.1.1)
-* [Documentation](https://omegaconf.readthedocs.io/en/2.1_branch/)
-* [Slides](https://docs.google.com/presentation/d/e/2PACX-1vT_UIV7hCnquIbLUm4NnkUpXvPEh33IKiUEvPRF850WKA8opOlZOszjKdZ3tPmf8u7hGNP6HpqS-NT5/pub?start=false&loop=false&delayms=3000)
-* [Source code](https://github.com/omry/omegaconf/tree/2.1_branch)
-
-Install with `pip install omegaconf==2.1`
-
-
-### Previous release (2.1)
-
-* [What's new](https://github.com/omry/omegaconf/releases/tag/v2.1.1)
-* [Documentation](https://omegaconf.readthedocs.io/en/2.1_branch/)
-* [Slides](https://docs.google.com/presentation/d/e/2PACX-1vT_UIV7hCnquIbLUm4NnkUpXvPEh33IKiUEvPRF850WKA8opOlZOszjKdZ3tPmf8u7hGNP6HpqS-NT5/pub?start=false&loop=false&delayms=3000)
-* [Source code](https://github.com/omry/omegaconf/tree/2.1_branch)
-
-Install with `pip install omegaconf==2.1`
-
-### Previous release (2.0)
-
-* [What's new](https://github.com/omry/omegaconf/releases/tag/v2.0.0)
-* [Documentation](https://omegaconf.readthedocs.io/en/2.0_branch/)
-* [Slides](https://docs.google.com/presentation/d/e/2PACX-1vT_UIV7hCnquIbLUm4NnkUpXvPEh33IKiUEvPRF850WKA8opOlZOszjKdZ3tPmf8u7hGNP6HpqS-NT5/pub?start=false&loop=false&delayms=3000)
-* [Source code](https://github.com/omry/omegaconf/tree/2.0_branch)
-
-Install with `pip install omegaconf==2.0.6`
-
 ## 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/README.md

@@ -0,0 +1,32 @@
+# OmegaConf
+|  | 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)|
+
+
+OmegaConf is a hierarchical configuration system, with support for merging configurations from multiple sources (YAML config files, dataclasses/objects and CLI arguments)
+providing a consistent API regardless of how the configuration was created.
+
+## Optional subprojects
+
+- [`omegaconf-pydevd`](./subprojects/omegaconf-pydevd/README.md): optional `pydevd` debugger plugin for inspecting OmegaConf objects in supported debuggers.
+
+## Releases
+
+### Upcoming (2.4.0.dev)
+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)
+
+### Stable (2.3)
+OmegaConf 2.3 is the current stable version.
+* [What's new](https://github.com/omry/omegaconf/releases/tag/v2.3.0)
+* [Documentation](https://omegaconf.readthedocs.io/en/2.3_branch/)
+* [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.dev4 → omegaconf-2.4.0.dev10}/build_helpers/build_helpers.py

@@ -147,7 +147,7 @@ class DevelopCommand(develop.develop):  # pragma: no cover
 
 class SDistCommand(sdist.sdist):  # pragma: no cover
     def run(self) -> None:
-        if not self.dry_run:
+        if not self.dry_run:  # type: ignore[attr-defined]
             self.run_command("clean")
             run_antlr(self)
         sdist.sdist.run(self)

{omegaconf-2.4.0.dev4 → omegaconf-2.4.0.dev10}/omegaconf/_utils.py

@@ -179,19 +179,72 @@ def yaml_is_bool(b: str) -> bool:
 
 def get_yaml_loader() -> Any:
     class OmegaConfLoader(BaseLoader):  # type: ignore
-        def construct_mapping(self, node: yaml.Node, deep: bool = False) -> Any:
-            keys = set()
-            for key_node, value_node in node.value:
+        def flatten_mapping(self, node: yaml.Node) -> Any:
+            merge_tag = "tag:yaml.org,2002:merge"
+            explicit_keys = set()
+            for key_node, _ in node.value:
+                if key_node.tag == merge_tag:
+                    continue
                 if key_node.tag != yaml.resolver.BaseResolver.DEFAULT_SCALAR_TAG:
                     continue
-                if key_node.value in keys:
+                if key_node.value in explicit_keys:
                     raise yaml.constructor.ConstructorError(
                         "while constructing a mapping",
                         node.start_mark,
                         f"found duplicate key {key_node.value}",
                         key_node.start_mark,
                     )
-                keys.add(key_node.value)
+                explicit_keys.add(key_node.value)
+
+            merge = []
+            index = 0
+            while index < len(node.value):
+                key_node, value_node = node.value[index]
+                if key_node.tag == merge_tag:
+                    del node.value[index]
+                    if isinstance(value_node, yaml.MappingNode):
+                        self.flatten_mapping(value_node)
+                        merge.extend(value_node.value)
+                    elif isinstance(value_node, yaml.SequenceNode):
+                        submerge = []
+                        for subnode in value_node.value:
+                            if not isinstance(subnode, yaml.MappingNode):
+                                raise yaml.constructor.ConstructorError(
+                                    "while constructing a mapping",
+                                    node.start_mark,
+                                    "expected a mapping for merging, but found "
+                                    f"{subnode.id}",
+                                    subnode.start_mark,
+                                )
+                            self.flatten_mapping(subnode)
+                            submerge.append(subnode.value)
+                        submerge.reverse()
+                        for value in submerge:
+                            merge.extend(value)
+                    else:
+                        raise yaml.constructor.ConstructorError(
+                            "while constructing a mapping",
+                            node.start_mark,
+                            "expected a mapping or list of mappings for merging, "
+                            f"but found {value_node.id}",
+                            value_node.start_mark,
+                        )
+                elif key_node.tag == "tag:yaml.org,2002:value":
+                    key_node.tag = yaml.resolver.BaseResolver.DEFAULT_SCALAR_TAG
+                    index += 1
+                else:
+                    index += 1
+
+            if merge:
+                merge = [
+                    (key_node, value_node)
+                    for key_node, value_node in merge
+                    if key_node.tag != yaml.resolver.BaseResolver.DEFAULT_SCALAR_TAG
+                    or key_node.value not in explicit_keys
+                ]
+                node.value = merge + node.value
+
+        def construct_mapping(self, node: yaml.Node, deep: bool = False) -> Any:
             return super().construct_mapping(node, deep=deep)
 
     loader = OmegaConfLoader
@@ -919,20 +972,16 @@ def format_and_raise(
     )
 
     if ref_type not in (None, Any):
-        template = dedent(
-            """\
+        template = dedent("""\
             $MSG
                 full_key: $FULL_KEY
                 reference_type=$REF_TYPE
-                object_type=$OBJECT_TYPE"""
-        )
+                object_type=$OBJECT_TYPE""")
     else:
-        template = dedent(
-            """\
+        template = dedent("""\
             $MSG
                 full_key: $FULL_KEY
-                object_type=$OBJECT_TYPE"""
-        )
+                object_type=$OBJECT_TYPE""")
     s = string.Template(template=template)
 
     message = s.substitute(

{omegaconf-2.4.0.dev4 → omegaconf-2.4.0.dev10}/omegaconf/base.py

@@ -248,16 +248,19 @@ class Node(ABC):
         self,
         throw_on_resolution_failure: bool = False,
         memo: Optional[Set[int]] = None,
+        resolved_node_cache: Optional[Dict[int, "Node"]] = None,
     ) -> Optional["Node"]:
         return self._dereference_node_impl(
             throw_on_resolution_failure=throw_on_resolution_failure,
             memo=memo,
+            resolved_node_cache=resolved_node_cache,
         )
 
     def _dereference_node_impl(
         self,
         throw_on_resolution_failure: bool,
         memo: Optional[Set[int]] = None,
+        resolved_node_cache: Optional[Dict[int, "Node"]] = None,
     ) -> Optional["Node"]:
         if not self._is_interpolation():
             return self
@@ -278,6 +281,7 @@ class Node(ABC):
             parse_tree=parse(_get_value(self)),
             throw_on_resolution_failure=throw_on_resolution_failure,
             memo=memo,
+            resolved_node_cache=resolved_node_cache,
         )
 
     def _get_root(self) -> "Container":
@@ -456,6 +460,7 @@ class Container(Box):
         throw_on_missing: bool,
         throw_on_resolution_failure: bool,
         memo: Optional[Set[int]] = None,
+        resolved_node_cache: Optional[Dict[int, "Node"]] = None,
     ) -> Tuple[Optional["Container"], Optional[str], Optional[Node]]:
         """
         Select a value using dot separated key sequence
@@ -482,6 +487,7 @@ class Container(Box):
                 ret = ret._maybe_dereference_node(
                     throw_on_resolution_failure=throw_on_resolution_failure,
                     memo=memo,
+                    resolved_node_cache=resolved_node_cache,
                 )
 
             if ret is not None and not isinstance(ret, Container):
@@ -506,12 +512,15 @@ class Container(Box):
         if value is None:
             return root, last_key, None
 
+        value_id = id(value)
+        if resolved_node_cache is not None and value_id in resolved_node_cache:
+            return root, last_key, resolved_node_cache[value_id]
+
         if memo is not None:
-            vid = id(value)
-            if vid in memo:
+            if value_id in memo:
                 raise InterpolationResolutionError("Recursive interpolation detected")
             # push to memo "stack"
-            memo.add(vid)
+            memo.add(value_id)
 
         try:
             value = root._maybe_resolve_interpolation(
@@ -520,11 +529,15 @@ class Container(Box):
                 value=value,
                 throw_on_resolution_failure=throw_on_resolution_failure,
                 memo=memo,
+                resolved_node_cache=resolved_node_cache,
             )
         finally:
             if memo is not None:
                 # pop from memo "stack"
-                memo.remove(vid)
+                memo.remove(value_id)
+
+        if resolved_node_cache is not None and value is not None:
+            resolved_node_cache[value_id] = value
 
         return root, last_key, value
 
@@ -536,6 +549,7 @@ class Container(Box):
         parse_tree: OmegaConfGrammarParser.ConfigValueContext,
         throw_on_resolution_failure: bool,
         memo: Optional[Set[int]],
+        resolved_node_cache: Optional[Dict[int, "Node"]] = None,
     ) -> Optional["Node"]:
         """
         Resolve an interpolation.
@@ -568,7 +582,11 @@ class Container(Box):
 
         try:
             resolved = self.resolve_parse_tree(
-                parse_tree=parse_tree, node=value, key=key, memo=memo
+                parse_tree=parse_tree,
+                node=value,
+                key=key,
+                memo=memo,
+                resolved_node_cache=resolved_node_cache,
             )
         except InterpolationResolutionError:
             if throw_on_resolution_failure:
@@ -636,7 +654,10 @@ class Container(Box):
             parent = parent._get_parent()
 
     def _resolve_node_interpolation(
-        self, inter_key: str, memo: Optional[Set[int]]
+        self,
+        inter_key: str,
+        memo: Optional[Set[int]],
+        resolved_node_cache: Optional[Dict[int, "Node"]] = None,
     ) -> "Node":
         """A node interpolation is of the form `${foo.bar}`"""
         try:
@@ -652,6 +673,7 @@ class Container(Box):
                 throw_on_missing=True,
                 throw_on_resolution_failure=True,
                 memo=memo,
+                resolved_node_cache=resolved_node_cache,
             )
         except MissingMandatoryValue as exc:
             raise InterpolationToMissingValueError(
@@ -696,6 +718,7 @@ class Container(Box):
         value: Node,
         throw_on_resolution_failure: bool,
         memo: Optional[Set[int]] = None,
+        resolved_node_cache: Optional[Dict[int, "Node"]] = None,
     ) -> Optional[Node]:
         value_kind = get_value_kind(value)
         if value_kind != ValueKind.INTERPOLATION:
@@ -709,6 +732,7 @@ class Container(Box):
             parse_tree=parse_tree,
             throw_on_resolution_failure=throw_on_resolution_failure,
             memo=memo if memo is not None else set(),
+            resolved_node_cache=resolved_node_cache,
         )
 
     def resolve_parse_tree(
@@ -717,6 +741,7 @@ class Container(Box):
         node: Node,
         memo: Optional[Set[int]] = None,
         key: Optional[Any] = None,
+        resolved_node_cache: Optional[Dict[int, "Node"]] = None,
     ) -> Any:
         """
         Resolve a given parse tree into its value.
@@ -728,7 +753,11 @@ class Container(Box):
         def node_interpolation_callback(
             inter_key: str, memo: Optional[Set[int]]
         ) -> Optional["Node"]:
-            return self._resolve_node_interpolation(inter_key=inter_key, memo=memo)
+            return self._resolve_node_interpolation(
+                inter_key=inter_key,
+                memo=memo,
+                resolved_node_cache=resolved_node_cache,
+            )
 
         def resolver_interpolation_callback(
             name: str, args: Tuple[Any, ...], args_str: Tuple[str, ...]

{omegaconf-2.4.0.dev4 → omegaconf-2.4.0.dev10}/omegaconf/basecontainer.py

@@ -214,9 +214,13 @@ class BaseContainer(Container, ABC):
         throw_on_missing: bool,
         enum_to_str: bool = False,
         structured_config_mode: SCMode = SCMode.DICT,
+        resolved_node_cache: Optional[Dict[int, Node]] = None,
     ) -> Union[None, Any, str, Dict[DictKeyType, Any], List[Any]]:
         from omegaconf import MISSING, DictConfig, ListConfig
 
+        if resolve and resolved_node_cache is None:
+            resolved_node_cache = {}
+
         def convert(val: Node) -> Any:
             value = val._value()
             if enum_to_str and isinstance(value, Enum):
@@ -230,11 +234,26 @@ class BaseContainer(Container, ABC):
             except MissingMandatoryValue as e:
                 conf._format_and_raise(key=key, value=None, cause=e)
             assert isinstance(node, Node)
+            node_id = id(node)
             if resolve:
-                try:
-                    node = node._dereference_node()
-                except InterpolationResolutionError as e:
-                    conf._format_and_raise(key=key, value=None, cause=e)
+                cached = (
+                    resolved_node_cache.get(node_id)
+                    if resolved_node_cache is not None
+                    else None
+                )
+                if cached is not None:
+                    node = cached
+                else:
+                    try:
+                        node = node._maybe_dereference_node(
+                            throw_on_resolution_failure=True,
+                            resolved_node_cache=resolved_node_cache,
+                        )
+                    except InterpolationResolutionError as e:
+                        conf._format_and_raise(key=key, value=None, cause=e)
+                    assert node is not None
+                    if resolved_node_cache is not None:
+                        resolved_node_cache[node_id] = node
 
             if isinstance(node, Container):
                 value = BaseContainer._to_content(
@@ -243,6 +262,7 @@ class BaseContainer(Container, ABC):
                     throw_on_missing=throw_on_missing,
                     enum_to_str=enum_to_str,
                     structured_config_mode=structured_config_mode,
+                    resolved_node_cache=resolved_node_cache,
                 )
             else:
                 value = convert(node)

{omegaconf-2.4.0.dev4 → omegaconf-2.4.0.dev10}/omegaconf/omegaconf.py

@@ -329,12 +329,10 @@ class OmegaConf:
     @staticmethod
     def register_resolver(name: str, resolver: Resolver) -> None:
         warnings.warn(
-            dedent(
-                """\
+            dedent("""\
             register_resolver() is deprecated.
             See https://github.com/omry/omegaconf/issues/426 for migration instructions.
-            """
-            ),
+            """),
             stacklevel=2,
         )
         return OmegaConf.legacy_register_resolver(name, resolver)

{omegaconf-2.4.0.dev4 → omegaconf-2.4.0.dev10}/omegaconf/typing.py

@@ -1,9 +1,4 @@
-import sys
-
-if sys.version_info >= (3, 10):
-    from typing import TypeAlias
-else:
-    from typing_extensions import TypeAlias
+from typing import TypeAlias
 
 from .vendor.antlr4.ParserRuleContext import ParserRuleContext
 

{omegaconf-2.4.0.dev4 → omegaconf-2.4.0.dev10}/omegaconf/version.py

@@ -1,10 +1,10 @@
 import sys  # pragma: no cover
 
-__version__ = "2.4.0.dev4"
+__version__ = "2.4.0.dev10"
 
-msg = """OmegaConf 2.4 and above is compatible with Python 3.9 and newer.
+msg = """OmegaConf 2.4 and above is compatible with Python 3.10 and newer.
 You have the following options:
-1. Upgrade to Python 3.9 or newer.
+1. Upgrade to Python 3.10 or newer.
    This is highly recommended. new features will not be added to OmegaConf 2.3.
 2. Continue using OmegaConf 2.3:
     You can pip install 'OmegaConf<2.4' to do that.

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

@@ -1,12 +1,11 @@
 Metadata-Version: 2.4
 Name: omegaconf
-Version: 2.4.0.dev4
+Version: 2.4.0.dev10
 Summary: A flexible configuration library
 Home-page: https://github.com/omry/omegaconf
 Author: Omry Yadan
 Author-email: omry@yadan.net
 Keywords: yaml configuration config
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -14,12 +13,10 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: PyYAML>=5.1.0
-Requires-Dist: dataclasses; python_version == "3.6"
-Requires-Dist: typing-extensions; python_version <= "3.9"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -35,16 +32,25 @@ Dynamic: summary
 # OmegaConf
 |  | 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?versions=1.4.*&versions=2.0.*&versions=2.1.*)![PyPI - Python Version](https://img.shields.io/pypi/pyversions/omegaconf.svg) |
-| 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)[![Total alerts](https://img.shields.io/lgtm/alerts/g/omry/omegaconf.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/omry/omegaconf/alerts/)[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/omry/omegaconf.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/omry/omegaconf/context:python)|
+| 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)|
 
 
 OmegaConf is a hierarchical configuration system, with support for merging configurations from multiple sources (YAML config files, dataclasses/objects and CLI arguments)
 providing a consistent API regardless of how the configuration was created.
 
+## Optional subprojects
+
+- [`omegaconf-pydevd`](./subprojects/omegaconf-pydevd/README.md): optional `pydevd` debugger plugin for inspecting OmegaConf objects in supported debuggers.
+
 ## Releases
 
+### Upcoming (2.4.0.dev)
+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)
+
 ### Stable (2.3)
 OmegaConf 2.3 is the current stable version.
 * [What's new](https://github.com/omry/omegaconf/releases/tag/v2.3.0)
@@ -53,33 +59,5 @@ OmegaConf 2.3 is the current stable version.
 
 Install with `pip install --upgrade omegaconf`
 
-### Previous release (2.2)
-
-* [What's new](https://github.com/omry/omegaconf/releases/tag/v2.1.1)
-* [Documentation](https://omegaconf.readthedocs.io/en/2.1_branch/)
-* [Slides](https://docs.google.com/presentation/d/e/2PACX-1vT_UIV7hCnquIbLUm4NnkUpXvPEh33IKiUEvPRF850WKA8opOlZOszjKdZ3tPmf8u7hGNP6HpqS-NT5/pub?start=false&loop=false&delayms=3000)
-* [Source code](https://github.com/omry/omegaconf/tree/2.1_branch)
-
-Install with `pip install omegaconf==2.1`
-
-
-### Previous release (2.1)
-
-* [What's new](https://github.com/omry/omegaconf/releases/tag/v2.1.1)
-* [Documentation](https://omegaconf.readthedocs.io/en/2.1_branch/)
-* [Slides](https://docs.google.com/presentation/d/e/2PACX-1vT_UIV7hCnquIbLUm4NnkUpXvPEh33IKiUEvPRF850WKA8opOlZOszjKdZ3tPmf8u7hGNP6HpqS-NT5/pub?start=false&loop=false&delayms=3000)
-* [Source code](https://github.com/omry/omegaconf/tree/2.1_branch)
-
-Install with `pip install omegaconf==2.1`
-
-### Previous release (2.0)
-
-* [What's new](https://github.com/omry/omegaconf/releases/tag/v2.0.0)
-* [Documentation](https://omegaconf.readthedocs.io/en/2.0_branch/)
-* [Slides](https://docs.google.com/presentation/d/e/2PACX-1vT_UIV7hCnquIbLUm4NnkUpXvPEh33IKiUEvPRF850WKA8opOlZOszjKdZ3tPmf8u7hGNP6HpqS-NT5/pub?start=false&loop=false&delayms=3000)
-* [Source code](https://github.com/omry/omegaconf/tree/2.0_branch)
-
-Install with `pip install omegaconf==2.0.6`
-
 ## 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.dev4 → omegaconf-2.4.0.dev10}/omegaconf.egg-info/SOURCES.txt

@@ -99,9 +99,6 @@ omegaconf/vendor/antlr4/tree/__init__.py
 omegaconf/vendor/antlr4/xpath/XPath.py
 omegaconf/vendor/antlr4/xpath/XPathLexer.py
 omegaconf/vendor/antlr4/xpath/__init__.py
-pydevd_plugins/__init__.py
-pydevd_plugins/extensions/__init__.py
-pydevd_plugins/extensions/pydevd_plugin_omegaconf.py
 requirements/base.txt
 tests/__init__.py
 tests/conftest.py
@@ -119,7 +116,6 @@ tests/test_merge.py
 tests/test_nested_containers.py
 tests/test_nodes.py
 tests/test_omegaconf.py
-tests/test_pydev_resolver_plugin.py
 tests/test_readonly.py
 tests/test_select.py
 tests/test_serialization.py

omegaconf-2.4.0.dev10/omegaconf.egg-info/requires.txt

@@ -0,0 +1 @@
+PyYAML>=5.1.0

omegaconf-2.4.0.dev10/omegaconf.egg-info/top_level.txt

@@ -0,0 +1 @@
+omegaconf

{omegaconf-2.4.0.dev4 → omegaconf-2.4.0.dev10}/pyproject.toml

@@ -6,16 +6,60 @@ exclude = '''
     | \.git          # root of the project
     | \.mypy_cache
     | omegaconf/grammar/gen
+    | omegaconf/vendor
     | \.nox
     | build
+    | subprojects
+    | temp
     | vendor
   )
 )
 '''
 
+[tool.isort]
+skip_glob = ["temp/*", "omegaconf/vendor/*", "subprojects/*"]
+
 [tool.pytest.ini_options]
 addopts = "--import-mode=append -Werror"
 pythonpath = ["."]
+norecursedirs = ["subprojects"]
+
+[tool.bumpversion]
+current_version = "2.4.0.dev10"
+parse = '''(?x)
+    (?P<major>\d+)
+    \.(?P<minor>\d+)
+    \.(?P<patch>\d+)
+    (?:
+        \.(?P<pre_l>dev)
+        (?P<pre_n>\d+)
+    )?
+'''
+serialize = [
+    "{major}.{minor}.{patch}.{pre_l}{pre_n}",
+    "{major}.{minor}.{patch}",
+]
+search = '{current_version}'
+replace = '{new_version}'
+regex = false
+ignore_missing_version = false
+tag = false
+sign_tags = false
+allow_dirty = false
+commit = false
+
+[tool.bumpversion.parts.pre_l]
+values = ["final", "dev"]
+optional_value = "final"
+
+[tool.bumpversion.parts.pre_n]
+first_value = "0"
+
+[[tool.bumpversion.files]]
+filename = "omegaconf/version.py"
+
+[[tool.bumpversion.files]]
+filename = "subprojects/omegaconf-pydevd/version.py"
 
 [tool.towncrier]
     package = "omegaconf"