Merge pull request #1970 from braingram/remove_deprecated

Start 5.0.0 development (remove deprecated code)

Author: braingram

asdf/_asdf.py

@@ -100,7 +100,7 @@ def __init__(
         self._extension_manager = None
 
         if custom_schema is not None:
-            self._custom_schema = schema._load_schema_cached(custom_schema, None, True)
+            self._custom_schema = schema._load_schema_cached(custom_schema, True)
         else:
             self._custom_schema = None
 
@@ -1121,7 +1121,7 @@ def get_history_entries(self):
 
         return []
 
-    def schema_info(self, key="description", path=None, preserve_list=True, refresh_extension_manager=NotSet):
+    def schema_info(self, key="description", path=None, preserve_list=True):
         """
         Get a nested dictionary of the schema information for a given key, relative to the path.
 
@@ -1140,27 +1140,18 @@ def schema_info(self, key="description", path=None, preserve_list=True, refresh_
             Default = None (full dictionary).
         preserve_list : bool
             If True, then lists are preserved. Otherwise, they are turned into dicts.
-        refresh_extension_manager : bool
-            If `True`, refresh the extension manager before looking up the
-            key.  This is useful if you want to make sure that the schema
-            data for a given key is up to date.
         """
-        if refresh_extension_manager is not NotSet:
-            warnings.warn("refresh_extension_manager is deprecated", DeprecationWarning)
-
         if isinstance(path, AsdfSearchResult):
             return path.schema_info(
                 key,
                 preserve_list=preserve_list,
-                refresh_extension_manager=refresh_extension_manager,
             )
 
         return node_info.collect_schema_info(
             key,
             path,
             self.tree,
             preserve_list=preserve_list,
-            refresh_extension_manager=refresh_extension_manager,
             extension_manager=self.extension_manager,
         )
 
@@ -1169,7 +1160,6 @@ def info(
         max_rows=display.DEFAULT_MAX_ROWS,
         max_cols=display.DEFAULT_MAX_COLS,
         show_values=display.DEFAULT_SHOW_VALUES,
-        refresh_extension_manager=NotSet,
     ):
         """
         Print a rendering of this file's tree to stdout.
@@ -1194,16 +1184,12 @@ def info(
             Set to False to disable display of primitive values in
             the rendered tree.
         """
-        if refresh_extension_manager is not NotSet:
-            warnings.warn("refresh_extension_manager is deprecated", DeprecationWarning)
-
         lines = display.render_tree(
             self.tree,
             max_rows=max_rows,
             max_cols=max_cols,
             show_values=show_values,
             identifier="root",
-            refresh_extension_manager=refresh_extension_manager,
             extension_manager=self.extension_manager,
         )
         print("\n".join(lines))

asdf/_core/_validators/ndarray.py

@@ -1,42 +1,26 @@
-import warnings
-
 from asdf.extension import Validator
 from asdf.tags.core.ndarray import validate_datatype, validate_max_ndim, validate_ndim
 
 
-def _warn_if_not_array(node, schema_property):
-    # warn here for non-ndarray tags, in a major version bump we can
-    # remove this and update the tags below to only match ndarrays
-    if not getattr(node, "_tag", "").startswith("tag:stsci.edu:asdf/core/ndarray-"):
-        warnings.warn(
-            f"Use of the {schema_property} validator with non-ndarray tags is deprecated. "
-            "Please define a custom validator for your tag",
-            DeprecationWarning,
-        )
-
-
 class NdimValidator(Validator):
     schema_property = "ndim"
-    tags = ["**"]
+    tags = ["tag:stsci.edu:asdf/core/ndarray-*"]
 
     def validate(self, expected_ndim, node, schema):
-        _warn_if_not_array(node, self.schema_property)
         yield from validate_ndim(None, expected_ndim, node, schema)
 
 
 class MaxNdimValidator(Validator):
     schema_property = "max_ndim"
-    tags = ["**"]
+    tags = ["tag:stsci.edu:asdf/core/ndarray-*"]
 
     def validate(self, max_ndim, node, schema):
-        _warn_if_not_array(node, self.schema_property)
         yield from validate_max_ndim(None, max_ndim, node, schema)
 
 
 class DatatypeValidator(Validator):
     schema_property = "datatype"
-    tags = ["**"]
+    tags = ["tag:stsci.edu:asdf/core/ndarray-*"]
 
     def validate(self, expected_datatype, node, schema):
-        _warn_if_not_array(node, self.schema_property)
         yield from validate_datatype(None, expected_datatype, node, schema)

asdf/_display.py

@@ -11,7 +11,6 @@
 import sys
 
 from ._node_info import create_tree
-from .util import NotSet
 
 __all__ = [
     "DEFAULT_MAX_COLS",
@@ -33,7 +32,6 @@ def render_tree(
     show_values=DEFAULT_SHOW_VALUES,
     filters=None,
     identifier="root",
-    refresh_extension_manager=NotSet,
     extension_manager=None,
 ):
     """
@@ -44,7 +42,6 @@ def render_tree(
         node=node,
         identifier=identifier,
         filters=[] if filters is None else filters,
-        refresh_extension_manager=refresh_extension_manager,
         extension_manager=extension_manager,
     )
     if info is None:

asdf/_node_info.py

@@ -3,7 +3,6 @@
 
 from .schema import load_schema
 from .treeutil import get_children, is_container
-from .util import NotSet
 
 
 def _filter_tree(info, filters):
@@ -139,7 +138,7 @@ def _get_schema_key(schema, key):
     return None
 
 
-def create_tree(key, node, identifier="root", filters=None, refresh_extension_manager=NotSet, extension_manager=None):
+def create_tree(key, node, identifier="root", filters=None, extension_manager=None):
     """
     Create a `NodeSchemaInfo` tree which can be filtered from a base node.
 
@@ -153,19 +152,13 @@ def create_tree(key, node, identifier="root", filters=None, refresh_extension_ma
         A list of functions that take a node and identifier and return True if the node should be included in the tree.
     preserve_list : bool
         If True, then lists are preserved. Otherwise, they are turned into dicts.
-    refresh_extension_manager : bool
-        DEPRECATED
-        If `True`, refresh the extension manager before looking up the
-        key.  This is useful if you want to make sure that the schema
-        data for a given key is up to date.
     """
     filters = [] if filters is None else filters
 
     schema_info = NodeSchemaInfo.from_root_node(
         key,
         identifier,
         node,
-        refresh_extension_manager=refresh_extension_manager,
         extension_manager=extension_manager,
     )
 
@@ -182,7 +175,6 @@ def collect_schema_info(
     identifier="root",
     filters=None,
     preserve_list=True,
-    refresh_extension_manager=NotSet,
     extension_manager=None,
 ):
     """
@@ -201,19 +193,13 @@ def collect_schema_info(
         A list of functions that take a node and identifier and return True if the node should be included in the tree.
     preserve_list : bool
         If True, then lists are preserved. Otherwise, they are turned into dicts.
-    refresh_extension_manager : bool
-        DEPRECATED
-        If `True`, refresh the extension manager before looking up the
-        key.  This is useful if you want to make sure that the schema
-        data for a given key is up to date.
     """
 
     schema_info = create_tree(
         key,
         node,
         identifier=identifier,
         filters=[] if filters is None else filters,
-        refresh_extension_manager=refresh_extension_manager,
         extension_manager=extension_manager,
     )
 
@@ -229,18 +215,10 @@ def collect_schema_info(
     return info
 
 
-def _get_extension_manager(refresh_extension_manager):
-    from ._asdf import AsdfFile, get_config
-    from .extension import ExtensionManager
-
-    if refresh_extension_manager is NotSet:
-        refresh_extension_manager = False
+def _get_extension_manager():
+    from ._asdf import AsdfFile
 
     af = AsdfFile()
-    if refresh_extension_manager:
-        config = get_config()
-        af._extension_manager = ExtensionManager(config.extensions)
-
     return af.extension_manager
 
 
@@ -364,15 +342,13 @@ def set_schema_from_node(self, node, extension_manager):
         self.schema = schema
 
     @classmethod
-    def from_root_node(
-        cls, key, root_identifier, root_node, schema=None, refresh_extension_manager=NotSet, extension_manager=None
-    ):
+    def from_root_node(cls, key, root_identifier, root_node, schema=None, extension_manager=None):
         """
         Build a NodeSchemaInfo tree from the given ASDF root node.
         Intentionally processes the tree in breadth-first order so that recursively
         referenced nodes are displayed at their shallowest reference point.
         """
-        extension_manager = extension_manager or _get_extension_manager(refresh_extension_manager)
+        extension_manager = extension_manager or _get_extension_manager()
 
         current_nodes = [(None, root_identifier, root_node)]
         seen = set()

asdf/_tests/test_deprecated.py

@@ -1,55 +0,0 @@
-import pytest
-
-import asdf
-
-
-def test_resolver_deprecation():
-
-    def resolver(uri):
-        return uri
-
-    with pytest.warns(DeprecationWarning, match="resolver is deprecated"):
-        asdf.schema.load_schema("http://stsci.edu/schemas/asdf/asdf-schema-1.0.0", resolver=resolver)
-
-
-@pytest.mark.parametrize("value", (True, False))
-def test_deprecate_refresh_extension_manager(value):
-    af = asdf.AsdfFile({"foo": 1})
-    with pytest.warns(DeprecationWarning, match="refresh_extension_manager is deprecated"):
-        af.schema_info(refresh_extension_manager=value)
-    with pytest.warns(DeprecationWarning, match="refresh_extension_manager is deprecated"):
-        af.info(refresh_extension_manager=value)
-    sr = af.search("foo")
-    with pytest.warns(DeprecationWarning, match="refresh_extension_manager is deprecated"):
-        sr.schema_info(refresh_extension_manager=value)
-
-
-@pytest.mark.parametrize(
-    "schema_property, schema_value",
-    (
-        ("ndim", 3),
-        ("datatype", "uint8"),
-        ("max_ndim", 3),
-    ),
-)
-def test_validator_deprecation(tmp_path, schema_property, schema_value):
-    schema = f"""%YAML 1.1
----
-type: object
-properties:
-  a:
-    {schema_property}: {schema_value}"""
-
-    schema_path = tmp_path / "custom_schema.yaml"
-    with schema_path.open("w") as f:
-        f.write(schema)
-
-    af = asdf.AsdfFile({"a": 1}, custom_schema=schema_path)
-    with pytest.warns(DeprecationWarning, match=f"Use of the {schema_property} validator with non-ndarray tag"):
-        with pytest.raises(asdf.exceptions.ValidationError):
-            af.validate()
-
-
-def test_url_mapping_deprecation():
-    with pytest.warns(DeprecationWarning, match="url_mapping is deprecated"):
-        asdf.schema.get_validator(url_mapping=lambda s: s)