Remove deprecated BaseContainer.{pretty,select,update_node}

news/671.api_change

@@ -0,0 +1 @@
+Remove BaseContainer.{pretty,select,update_node} that have been deprecated since OmegaConf 2.0.

omegaconf/base.py

@@ -298,18 +298,6 @@ class Container(Node):
 
     _metadata: ContainerMetadata
 
-    @abstractmethod
-    def pretty(self, resolve: bool = False, sort_keys: bool = False) -> str:
-        ...
-
-    @abstractmethod
-    def update_node(self, key: str, value: Any = None) -> None:
-        ...
-
-    @abstractmethod
-    def select(self, key: str, throw_on_missing: bool = False) -> Any:
-        ...
-
     def _get_node(
         self,
         key: Any,

omegaconf/basecontainer.py

@@ -1,9 +1,7 @@
 import copy
 import sys
-import warnings
 from abc import ABC, abstractmethod
 from enum import Enum
-from textwrap import dedent
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple, Union
 
 import yaml
@@ -156,28 +154,6 @@ def fail() -> None:
 
             OmegaConf.update(self, key, value, merge=True)
 
-    def select(self, key: str, throw_on_missing: bool = False) -> Any:
-        from omegaconf import OmegaConf
-
-        warnings.warn(
-            "select() is deprecated, use OmegaConf.select(). (Since 2.0)",
-            category=UserWarning,
-            stacklevel=2,
-        )
-
-        return OmegaConf.select(self, key, throw_on_missing=throw_on_missing)
-
-    def update_node(self, key: str, value: Any = None) -> None:
-        from omegaconf import OmegaConf
-
-        warnings.warn(
-            "update_node() is deprecated, use OmegaConf.update(). (Since 2.0)",
-            category=UserWarning,
-            stacklevel=2,
-        )
-
-        OmegaConf.update(self, key, value, merge=False)
-
     def is_empty(self) -> bool:
         """return true if config is empty"""
         return len(self.__dict__["_content"]) == 0
@@ -261,21 +237,6 @@ def convert(val: Node) -> Any:
 
         assert False
 
-    def pretty(self, resolve: bool = False, sort_keys: bool = False) -> str:
-        from omegaconf import OmegaConf
-
-        warnings.warn(
-            dedent(
-                """\
-            cfg.pretty() is deprecated and will be removed in a future version.
-            Use OmegaConf.to_yaml(cfg)
-            """
-            ),
-            category=UserWarning,
-        )
-
-        return OmegaConf.to_yaml(self, resolve=resolve, sort_keys=sort_keys)
-
     @staticmethod
     def _map_merge(dest: "BaseContainer", src: "BaseContainer") -> None:
         """merge src into dest and return a new copy, does not modified input"""

tests/test_select.py

@@ -2,7 +2,7 @@
 from typing import Any, Optional
 
 from _pytest.python_api import RaisesContext
-from pytest import mark, param, raises, warns
+from pytest import mark, param, raises
 
 from omegaconf import MissingMandatoryValue, OmegaConf
 from omegaconf._utils import _ensure_container
@@ -182,17 +182,6 @@ def test_select_from_dict(self, struct: Optional[bool]) -> None:
         assert OmegaConf.select(cfg, "missing", throw_on_missing=False) is None
         assert OmegaConf.select(cfg, "missing") is None
 
-    def test_select_deprecated(self, struct: Optional[bool]) -> None:
-        cfg = OmegaConf.create({"foo": "bar"})
-        OmegaConf.set_struct(cfg, struct)
-        with warns(
-            expected_warning=UserWarning,
-            match=re.escape(
-                "select() is deprecated, use OmegaConf.select(). (Since 2.0)"
-            ),
-        ):
-            cfg.select("foo")
-
 
 @mark.parametrize(
     "cfg,key,expected",

tests/test_to_yaml.py

@@ -1,8 +1,7 @@
-import re
 from textwrap import dedent
 from typing import Any
 
-from pytest import mark, warns
+from pytest import mark
 
 from omegaconf import DictConfig, EnumNode, ListConfig, OmegaConf, _utils
 from tests import Enum1, User
@@ -136,22 +135,6 @@ def test_to_yaml_with_enum_key() -> None:
     assert s == expected
 
 
-def test_pretty_deprecated() -> None:
-    c = OmegaConf.create({"foo": "bar"})
-    with warns(
-        expected_warning=UserWarning,
-        match=re.escape(
-            dedent(
-                """\
-            cfg.pretty() is deprecated and will be removed in a future version.
-            Use OmegaConf.to_yaml(cfg)
-            """,
-            )
-        ),
-    ):
-        assert c.pretty() == "foo: bar\n"
-
-
 @mark.parametrize(
     "user",
     [

tests/test_update.py

@@ -164,18 +164,6 @@ def test_update_list_make_dict() -> None:
     assert c == [{"a": {"a": "aa", "b": "ab"}}, {"b": {"a": "ba", "b": "bb"}}]
 
 
-def test_update_node_deprecated() -> None:
-    c = OmegaConf.create()
-    with warns(
-        expected_warning=UserWarning,
-        match=re.escape(
-            "update_node() is deprecated, use OmegaConf.update(). (Since 2.0)"
-        ),
-    ):
-        c.update_node("foo", "bar")
-    assert c.foo == "bar"
-
-
 def test_update_list_index_error() -> None:
     c = OmegaConf.create([1, 2, 3])
     assert isinstance(c, ListConfig)