omegaconf 2.4.0.dev3__tar.gz → 2.4.0.dev4__tar.gz

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

@@ -1,23 +1,36 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: omegaconf
-Version: 2.4.0.dev3
+Version: 2.4.0.dev4
 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.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+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.8
+Requires-Python: >=3.9
 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
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # OmegaConf
 |  | Description |

{omegaconf-2.4.0.dev3 → omegaconf-2.4.0.dev4}/build_helpers/build_helpers.py

@@ -1,4 +1,3 @@
-import codecs
 import distutils.log
 import errno
 import os
@@ -64,26 +63,26 @@ class ANTLRCommand(Command):  # type: ignore  # pragma: no cover
         build_dir = Path(__file__).parent.absolute()
         project_root = build_dir.parent
         lib = "antlr4"
-        pkgname = 'omegaconf.vendor'
+        pkgname = "omegaconf.vendor"
 
         replacements = [
             partial(  # import antlr4 -> import omegaconf.vendor.antlr4
-                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 antlr4 -> from fomegaconf.vendor.antlr4
-                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),
             ),
         ]
 
         path = project_root / "omegaconf" / "grammar" / "gen"
         for item in path.iterdir():
             if item.is_file() and item.name.endswith(".py"):
-                text = item.read_text('utf8')
+                text = item.read_text("utf8")
                 for replacement in replacements:
                     text = replacement(text)
-                item.write_text(text, 'utf8')
+                item.write_text(text, "utf8")
 
 
 class BuildPyCommand(build_py.build_py):  # pragma: no cover
@@ -148,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:  # type: ignore
+        if not self.dry_run:
             self.run_command("clean")
             run_antlr(self)
         sdist.sdist.run(self)
@@ -196,7 +195,7 @@ def find(
 
 def find_version(*file_paths: str) -> str:
     root = Path(__file__).parent.parent.absolute()
-    with codecs.open(root / Path(*file_paths), "r") as fp:  # type: ignore
+    with open(root / Path(*file_paths), "r", encoding="utf-8") as fp:
         version_file = fp.read()
     version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]", version_file, re.M)
     if version_match:

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

@@ -114,6 +114,7 @@ _DEFAULT_MARKER_: Any = Marker("_DEFAULT_MARKER_")
 
 class OmegaConfDumper(BaseDumper):  # type: ignore
     str_representer_added = False
+    pathlib_representers_added = False
 
     @staticmethod
     def str_representer(dumper: yaml.Dumper, data: str) -> yaml.ScalarNode:
@@ -124,11 +125,51 @@ class OmegaConfDumper(BaseDumper):  # type: ignore
             style=("'" if with_quotes else None),
         )
 
+    @staticmethod
+    def pathlib_path_representer(dumper: yaml.Dumper, data: Any) -> yaml.Node:
+        # Use old pathlib.Path tag for cross-version compatibility
+        # Extract constructor args from __reduce__ and use sequence representation
+        return dumper.represent_sequence(  # pragma: no cover
+            "tag:yaml.org,2002:python/object/apply:pathlib.Path",
+            [str(data)],
+        )
+
+    @staticmethod
+    def pathlib_posix_path_representer(dumper: yaml.Dumper, data: Any) -> yaml.Node:
+        # Use old pathlib.PosixPath tag for cross-version compatibility
+        return dumper.represent_sequence(
+            "tag:yaml.org,2002:python/object/apply:pathlib.PosixPath",
+            [str(data)],
+        )
+
+    @staticmethod
+    def pathlib_windows_path_representer(dumper: yaml.Dumper, data: Any) -> yaml.Node:
+        # Use old pathlib.WindowsPath tag for cross-version compatibility
+        return dumper.represent_sequence(  # pragma: no cover
+            "tag:yaml.org,2002:python/object/apply:pathlib.WindowsPath",
+            [str(data)],
+        )
+
 
 def get_omega_conf_dumper() -> Type[OmegaConfDumper]:
     if not OmegaConfDumper.str_representer_added:
         OmegaConfDumper.add_representer(str, OmegaConfDumper.str_representer)
         OmegaConfDumper.str_representer_added = True
+
+    # Add representers for pathlib types to ensure cross-version compatibility.
+    # Python 3.13+ uses pathlib._local.* internally, so we normalize to old pathlib.* tags
+    if not OmegaConfDumper.pathlib_representers_added:
+        from pathlib import Path, PosixPath, WindowsPath
+
+        OmegaConfDumper.add_representer(Path, OmegaConfDumper.pathlib_path_representer)
+        OmegaConfDumper.add_representer(
+            PosixPath, OmegaConfDumper.pathlib_posix_path_representer
+        )
+        OmegaConfDumper.add_representer(
+            WindowsPath, OmegaConfDumper.pathlib_windows_path_representer
+        )
+        OmegaConfDumper.pathlib_representers_added = True
+
     return OmegaConfDumper
 
 
@@ -190,6 +231,20 @@ def get_yaml_loader() -> Any:
         lambda loader, node: pathlib.WindowsPath(*loader.construct_sequence(node)),
     )
 
+    # Python 3.13+ uses internal pathlib._local module
+    loader.add_constructor(
+        "tag:yaml.org,2002:python/object/apply:pathlib._local.Path",
+        lambda loader, node: pathlib.Path(*loader.construct_sequence(node)),
+    )
+    loader.add_constructor(
+        "tag:yaml.org,2002:python/object/apply:pathlib._local.PosixPath",
+        lambda loader, node: pathlib.PosixPath(*loader.construct_sequence(node)),
+    )
+    loader.add_constructor(
+        "tag:yaml.org,2002:python/object/apply:pathlib._local.WindowsPath",
+        lambda loader, node: pathlib.WindowsPath(*loader.construct_sequence(node)),
+    )
+
     return loader
 
 
@@ -350,7 +405,7 @@ def get_attr_data(obj: Any, allow_objects: Optional[bool] = None) -> Dict[str, A
                 value = MISSING
         if is_union_annotation(type_) and not is_supported_union_annotation(type_):
             e = ConfigValueError(
-                f"Unions of containers are not supported:\n{name}: {type_str(type_)}"
+                f"Unions of containers are not supported:\n{name}: {type_str(type_)}"  # noqa: E231
             )
             format_and_raise(node=None, key=None, value=value, cause=e, msg=str(e))
 
@@ -409,7 +464,7 @@ def get_dataclass_data(
 
         if is_union_annotation(type_) and not is_supported_union_annotation(type_):
             e = ConfigValueError(
-                f"Unions of containers are not supported:\n{name}: {type_str(type_)}"
+                f"Unions of containers are not supported:\n{name}: {type_str(type_)}"  # noqa: E231
             )
             format_and_raise(node=None, key=None, value=value, cause=e, msg=str(e))
         try:
@@ -941,7 +996,14 @@ def type_str(t: Any, include_module_name: bool = False) -> str:
             and t.__module__ != "typing"
             and not t.__module__.startswith("omegaconf.")
         ):
-            module_prefix = str(t.__module__) + "."
+            module_name = str(t.__module__)
+            if isinstance(t, type) and issubclass(t, pathlib.PurePath):
+                # Python 3.13+ uses pathlib._local internally, normalize to pathlib for # Path types
+                # Normalize pathlib._local to pathlib for cross-version compatibility
+                if module_name == "pathlib._local":  # pragma: no cover
+                    module_name = "pathlib"
+
+            module_prefix = module_name + "."
         else:
             module_prefix = ""
         ret = module_prefix + ret

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

@@ -738,9 +738,9 @@ class BaseContainer(Container, ABC):
 
         def _slice_to_str(x: slice) -> str:
             if x.step is not None:
-                return f"{x.start}:{x.stop}:{x.step}"
+                return f"{x.start}:{x.stop}:{x.step}"  # noqa: E231
             else:
-                return f"{x.start}:{x.stop}"
+                return f"{x.start}:{x.stop}"  # noqa: E231
 
         def prepand(
             full_key: str,

{omegaconf-2.4.0.dev3 → omegaconf-2.4.0.dev4}/omegaconf/grammar/gen/OmegaConfGrammarLexer.py

@@ -1,4 +1,4 @@
-# Generated from /home/homestar/dev/omegaconf/omegaconf/grammar/OmegaConfGrammarLexer.g4 by ANTLR 4.11.1
+# Generated from /home/runner/work/omegaconf/omegaconf/omegaconf/grammar/OmegaConfGrammarLexer.g4 by ANTLR 4.11.1
 from omegaconf.vendor.antlr4 import *
 from io import StringIO
 import sys

{omegaconf-2.4.0.dev3 → omegaconf-2.4.0.dev4}/omegaconf/grammar/gen/OmegaConfGrammarParser.py

@@ -1,4 +1,4 @@
-# Generated from /home/homestar/dev/omegaconf/omegaconf/grammar/OmegaConfGrammarParser.g4 by ANTLR 4.11.1
+# Generated from /home/runner/work/omegaconf/omegaconf/omegaconf/grammar/OmegaConfGrammarParser.g4 by ANTLR 4.11.1
 # encoding: utf-8
 from omegaconf.vendor.antlr4 import *
 from io import StringIO

{omegaconf-2.4.0.dev3 → omegaconf-2.4.0.dev4}/omegaconf/grammar/gen/OmegaConfGrammarParserListener.py

@@ -1,4 +1,4 @@
-# Generated from /home/homestar/dev/omegaconf/omegaconf/grammar/OmegaConfGrammarParser.g4 by ANTLR 4.11.1
+# Generated from /home/runner/work/omegaconf/omegaconf/omegaconf/grammar/OmegaConfGrammarParser.g4 by ANTLR 4.11.1
 from omegaconf.vendor.antlr4 import *
 if __name__ is not None and "." in __name__:
     from .OmegaConfGrammarParser import OmegaConfGrammarParser

{omegaconf-2.4.0.dev3 → omegaconf-2.4.0.dev4}/omegaconf/grammar/gen/OmegaConfGrammarParserVisitor.py

@@ -1,4 +1,4 @@
-# Generated from /home/homestar/dev/omegaconf/omegaconf/grammar/OmegaConfGrammarParser.g4 by ANTLR 4.11.1
+# Generated from /home/runner/work/omegaconf/omegaconf/omegaconf/grammar/OmegaConfGrammarParser.g4 by ANTLR 4.11.1
 from omegaconf.vendor.antlr4 import *
 if __name__ is not None and "." in __name__:
     from .OmegaConfGrammarParser import OmegaConfGrammarParser

{omegaconf-2.4.0.dev3 → omegaconf-2.4.0.dev4}/omegaconf/grammar_parser.py

@@ -28,8 +28,10 @@ _node_inter = f"\\${{\\s*{_node_path}\\s*}}"  # node interpolation ${foo.bar}
 _id = "[a-zA-Z_][\\w\\-]*"  # foo, foo_bar, foo-bar, abc123
 _resolver_name = f"({_id}(\\.{_id})*)?"  # foo, ns.bar3, ns_1.ns_2.b0z
 _arg = r"[a-zA-Z_0-9/\-\+.$%*@?|]+"  # string representing a resolver argument
-_args = f"{_arg}(\\s*,\\s*{_arg})*"  # list of resolver arguments
-_resolver_inter = f"\\${{\\s*{_resolver_name}\\s*:\\s*{_args}?\\s*}}"  # ${foo:bar}
+_args = f"{_arg}(\\s*,\\s*{_arg})*"  # list of resolver arguments  # noqa: E231
+_resolver_inter = (
+    f"\\${{\\s*{_resolver_name}\\s*:\\s*{_args}?\\s*}}"  # ${foo:bar}  # noqa: E231
+)
 _inter = f"({_node_inter}|{_resolver_inter})"  # any kind of interpolation
 _outer = "([^$]|\\$(?!{))+"  # any character except $ (unless not followed by {)
 SIMPLE_INTERPOLATION_PATTERN = re.compile(

{omegaconf-2.4.0.dev3 → omegaconf-2.4.0.dev4}/omegaconf/grammar_visitor.py

@@ -251,7 +251,7 @@ class GrammarVisitor(OmegaConfGrammarParserVisitor):
             warnings.warn(
                 f"In the sequence `{txt}` some elements are missing: please replace "
                 f"them with empty quoted strings. "
-                f"See https://github.com/omry/omegaconf/issues/572 for details.",
+                f"See https://github.com/omry/omegaconf/issues/572 for details.",  # noqa: E231
                 category=UserWarning,
             )
 

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

@@ -372,7 +372,7 @@ class OmegaConf:
                     f"to be an interpolation. Nested interpolations are not supported for "
                     f"resolvers registered with `[legacy_]register_resolver()`, please use "
                     f"`register_new_resolver()` instead (see "
-                    f"https://github.com/omry/omegaconf/issues/426 for migration instructions)."
+                    f"https://github.com/omry/omegaconf/issues/426 for migration instructions)."  # noqa: E231
                 )
             key = args_str
             val = cache[key] if key in cache else resolver(*args_unesc)
@@ -485,7 +485,7 @@ class OmegaConf:
         Returns a bool: True if resolver is removed and False if not removed.
 
         .. warning:
-            This method can remove deafult resolvers as well.
+            This method can remove default resolvers as well.
 
         :param name: Name of the resolver.
         :return: A bool (``True`` if resolver is removed, ``False`` if not found before removing).

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

@@ -1,14 +1,14 @@
 import sys  # pragma: no cover
 
-__version__ = "2.4.0.dev3"
+__version__ = "2.4.0.dev4"
 
-msg = """OmegaConf 2.4 and above is compatible with Python 3.8 and newer.
+msg = """OmegaConf 2.4 and above is compatible with Python 3.9 and newer.
 You have the following options:
-1. Upgrade to Python 3.8 or newer.
+1. Upgrade to Python 3.9 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.
 """
 
-if sys.version_info < (3, 8):
+if sys.version_info < (3, 9):
     raise ImportError(msg)  # pragma: no cover

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

@@ -1,23 +1,36 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: omegaconf
-Version: 2.4.0.dev3
+Version: 2.4.0.dev4
 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.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+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.8
+Requires-Python: >=3.9
 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
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # OmegaConf
 |  | Description |

omegaconf-2.4.0.dev4/pydevd_plugins/__init__.py

@@ -0,0 +1,3 @@
+import pkgutil
+
+__path__ = pkgutil.extend_path(__path__, __name__)

omegaconf-2.4.0.dev4/pydevd_plugins/extensions/__init__.py

@@ -0,0 +1,3 @@
+import pkgutil
+
+__path__ = pkgutil.extend_path(__path__, __name__)

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

@@ -14,7 +14,7 @@ exclude = '''
 '''
 
 [tool.pytest.ini_options]
-addopts = "--import-mode=append -Werror -W 'ignore:pkg_resources is deprecated as an API:DeprecationWarning' -W 'ignore:Deprecated call to `pkg_resources:DeprecationWarning'"
+addopts = "--import-mode=append -Werror"
 pythonpath = ["."]
 
 [tool.towncrier]

{omegaconf-2.4.0.dev3 → omegaconf-2.4.0.dev4}/setup.py

@@ -70,12 +70,14 @@ with open("README.md", "r") as fh:
             "pydevd_plugins.extensions",
         ]
         + vendored_packages,
-        python_requires=">=3.8",
+        python_requires=">=3.9",
         classifiers=[
-            "Programming Language :: Python :: 3.8",
             "Programming Language :: Python :: 3.9",
             "Programming Language :: Python :: 3.10",
             "Programming Language :: Python :: 3.11",
+            "Programming Language :: Python :: 3.12",
+            "Programming Language :: Python :: 3.13",
+            "Programming Language :: Python :: 3.14",
             "License :: OSI Approved :: BSD License",
             "Operating System :: OS Independent",
         ],

{omegaconf-2.4.0.dev3 → omegaconf-2.4.0.dev4}/tests/interpolation/built_in_resolvers/test_oc_decode.py

@@ -49,7 +49,7 @@ def test_decode(monkeypatch: Any, value: Optional[str], expected: Any) -> None:
         {
             # The node of interest is "node" (others are used to test interpolations).
             "parent": {
-                "node": f"${{oc.decode:'{value}'}}",
+                "node": f"${{oc.decode:'{value}'}}",  # noqa: E231
                 "sibling": 1,
             },
             "uncle": 2,
@@ -100,6 +100,6 @@ def test_decode_none() -> None:
     ],
 )
 def test_decode_error(monkeypatch: Any, value: Any, exc: Any) -> None:
-    c = OmegaConf.create({"x": f"${{oc.decode:{value}}}"})
+    c = OmegaConf.create({"x": f"${{oc.decode:{value}}}"})  # noqa: E231
     with exc:
         c.x

{omegaconf-2.4.0.dev3 → omegaconf-2.4.0.dev4}/tests/test_errors.py

@@ -1663,7 +1663,7 @@ def test_resolver_error(restore_resolvers: Any, register_func: Any) -> None:
     c = OmegaConf.create({"div_by_zero": "${div:1,0}"})
     expected_msg = dedent(
         """\
-        ZeroDivisionError raised while resolving interpolation: float division( by zero)?
+        ZeroDivisionError raised while resolving interpolation: (float )?division( by zero)?
             full_key: div_by_zero
             object_type=dict"""
     )

{omegaconf-2.4.0.dev3 → omegaconf-2.4.0.dev4}/tests/test_grammar.py

@@ -191,9 +191,9 @@ PARAMS_SINGLE_ELEMENT_NO_INTERPOLATION: List[Tuple[str, str, Any]] = [
     ),
     (
         "dict_unquoted_key",
-        rf"{{a0-null-1-3.14-NaN- {TAB}-true-False-{UNQUOTED_SPECIAL}\(\)\[\]\{{\}}\:\=\ \{TAB}\,:0}}",
+        rf"{{a0-null-1-3.14-NaN- {TAB}-true-False-{UNQUOTED_SPECIAL}\(\)\[\]\{{\}}\:\=\ \{TAB}\,:0}}",  # noqa: E231
         {
-            rf"a0-null-1-3.14-NaN- {TAB}-true-False-{UNQUOTED_SPECIAL}()[]{{}}:= {TAB},": 0
+            rf"a0-null-1-3.14-NaN- {TAB}-true-False-{UNQUOTED_SPECIAL}()[]{{}}:= {TAB},": 0  # noqa: E231
         },
     ),
     (

{omegaconf-2.4.0.dev3 → omegaconf-2.4.0.dev4}/tests/test_nodes.py

@@ -1,6 +1,7 @@
 import copy
 import functools
 import re
+import sys
 from enum import Enum
 from functools import partial
 from pathlib import Path
@@ -837,8 +838,11 @@ def test_eq(node: ValueNode, value: Any, expected: Any) -> None:
     assert (value != node) != expected
 
     # Check hash except for unhashable types (dict/list).
-    if not isinstance(value, (dict, list)):
-        assert (node.__hash__() == value.__hash__()) == expected
+    # Per Python's hash contract: if a == b, then hash(a) == hash(b)
+    # Note: if a != b, hashes may or may not be equal (collisions are allowed)
+    # E.g. Path('a') != 'a' but their hashes are equal as of Python 3.12
+    if not isinstance(value, (dict, list)) and expected:
+        assert node.__hash__() == value.__hash__()
 
 
 @mark.parametrize(
@@ -992,3 +996,46 @@ def test_interpolation_result_readonly(flags: Any) -> None:
     # If no value was provided for the "readonly" flag, it should be set.
     if readonly is None:
         assert node._get_node_flag("readonly")
+
+
+@mark.skipif(
+    sys.version_info < (3, 12),
+    reason="Hash collision between Path and str only exists in Python 3.12+",
+)
+def test_path_str_hash_collision_handling() -> None:
+    """
+    Regression test for Python 3.12+ hash collision between Path and str.
+
+    In Python 3.12+, Path('x') and 'x' have identical hashes but are not equal.
+    This test verifies that OmegaConf's containers handle this collision correctly.
+    """
+    from pathlib import Path
+
+    path_str = "hello.txt"
+    path_obj = Path(path_str)
+    assert hash(path_obj) == hash(path_str)
+    assert path_obj != path_str  # type: ignore[comparison-overlap]
+
+    # Test PathNode behavior with hash collision
+    path_node = PathNode(path_obj)
+    assert hash(path_node) == hash(path_str)
+    assert path_node != path_str
+
+    list_cfg1 = OmegaConf.create([path_obj])
+    assert path_obj in list_cfg1
+    assert path_str not in list_cfg1
+
+    list_cfg2 = OmegaConf.create([path_str])
+    assert path_obj not in list_cfg2
+    assert path_str in list_cfg2
+
+    # Test DictConfig with both types as values
+    dict_cfg = OmegaConf.create(
+        {
+            "by_path": {"file": path_obj},
+            "by_string": {"file": path_str},
+        }
+    )
+    assert dict_cfg.by_path.file == path_obj
+    assert dict_cfg.by_string.file == path_str
+    assert dict_cfg.by_path.file != dict_cfg.by_string.file

omegaconf-2.4.0.dev3/pydevd_plugins/__init__.py

@@ -1,6 +0,0 @@
-try:
-    __import__("pkg_resources").declare_namespace(__name__)
-except ImportError:  # pragma: no cover
-    import pkgutil
-
-    __path__ = pkgutil.extend_path(__path__, __name__)

omegaconf-2.4.0.dev3/pydevd_plugins/extensions/__init__.py

@@ -1,6 +0,0 @@
-try:
-    __import__("pkg_resources").declare_namespace(__name__)
-except ImportError:  # pragma: no cover
-    import pkgutil
-
-    __path__ = pkgutil.extend_path(__path__, __name__)