Merge pull request #147 from csiro-coasts/task/remove-deprecated-code

Remove some deprecated code

Author: mx-moth

docs/releases/development.rst

@@ -51,3 +51,7 @@ Next release (in development)
   By dropping geometry the results are more consistent across all conventions
   and do not contain potentially fragmented geometry information.
   (:issue:`106`, :pr:`146`).
+* Remove support for the deprecated `emsarray.formats` module,
+  the `emsarray.formats` entry point,
+  and filtered warnings for old dependencies no longer supported
+  (:pr:`146`).

pyproject.toml

@@ -97,10 +97,6 @@ addopts = [
 testpaths = ["tests"]
 filterwarnings = [
 	"error",
-	"ignore:GeometryTypeError will derive from ShapelyError:shapely.errors.ShapelyDeprecationWarning",
-	# xarray.backends.plugins uses a deprecated interface
-	# Fixed in xarray >= v2022.06.0
-	"ignore:SelectableGroups dict interface is deprecated. Use select.:DeprecationWarning",
 ]
 markers = [
 	"matplotlib: Tests that involve matplotlib and plotting",

src/emsarray/conventions/_registry.py

@@ -1,5 +1,4 @@
 import logging
-import warnings
 from collections.abc import Iterable
 from contextlib import suppress
 from functools import cached_property
@@ -138,35 +137,23 @@ def entry_point_conventions() -> Iterable[type[Convention]]:
     Finds conventions registered using entry points
     """
     seen = set()
-
-    groups = [
-        ('emsarray.conventions', False),
-        ('emsarray.formats', True),
-    ]
-    for group, deprecated in groups:
-        entry_points = metadata.entry_points(group=group)
-
-        for entry_point in entry_points:
-            if deprecated:
-                warnings.warn(
-                    '`emsarray.formats` entrypoint has been renamed to `emsarray.conventions`. '
-                    f'Update `{entry_point.name} = {entry_point.value}` to use the new entrypoint name.',
-                    category=DeprecationWarning)
-            try:
-                obj = entry_point.load()
-            except (AttributeError, ImportError):
-                logger.exception("Error loading entry point %s", entry_point)
-                continue
-
-            if not (isinstance(obj, type) and issubclass(obj, Convention)):
-                logger.error(
-                    "Entry point `%s = %s` refers to %r not a Convention subclass",
-                    entry_point.name, entry_point.value, obj)
-                continue
-
-            if obj not in seen:
-                yield obj
-                seen.add(obj)
+    entry_points = metadata.entry_points(group='emsarray.conventions')
+    for entry_point in entry_points:
+        try:
+            obj = entry_point.load()
+        except (AttributeError, ImportError):
+            logger.exception("Error loading entry point %s", entry_point)
+            continue
+
+        if not (isinstance(obj, type) and issubclass(obj, Convention)):
+            logger.error(
+                "Entry point `%s = %s` refers to %r not a Convention subclass",
+                entry_point.name, entry_point.value, obj)
+            continue
+
+        if obj not in seen:
+            yield obj
+            seen.add(obj)
 
 
 def register_convention(convention: type[Convention]) -> type[Convention]:

src/emsarray/formats.py

@@ -3,8 +3,6 @@
 """
 from importlib import metadata
 
-import pytest
-
 from emsarray.conventions import (
     ArakawaC, CFGrid1D, CFGrid2D, ShocSimple, ShocStandard, UGrid, _registry
 )
@@ -84,23 +82,6 @@ def test_mock_entry_points(caplog, monkeypatch):
     assert len(caplog.records) == 0
 
 
-def test_mock_entry_points_deprecated(caplog, monkeypatch):
-    monkeypatch_entrypoint(monkeypatch, {
-        'emsarray.conventions': [
-            ('CFGrid1D', 'emsarray.conventions.grid:CFGrid1D'),
-        ],
-        'emsarray.formats': [
-            ('CFGrid2D', 'emsarray.conventions.grid:CFGrid2D'),
-        ],
-    })
-    with pytest.warns(DeprecationWarning) as captured_warnings:
-        assert list(entry_point_conventions()) == [CFGrid1D, CFGrid2D]
-    assert str(captured_warnings[0].message) == (
-        '`emsarray.formats` entrypoint has been renamed to `emsarray.conventions`. '
-        'Update `CFGrid2D = emsarray.conventions.grid:CFGrid2D` to use the new entrypoint name.')
-    assert len(caplog.records) == 0
-
-
 def test_mock_entry_points_duplicate(caplog, monkeypatch):
     monkeypatch_entrypoint(monkeypatch, {'emsarray.conventions': [
         ('CFGrid1D', 'emsarray.conventions.grid:CFGrid1D'),