From 2e5a085a4d748b8ab9463c1e20f0859520032a4c Mon Sep 17 00:00:00 2001 From: cvanelteren Date: Tue, 21 Jul 2026 14:05:05 +1000 Subject: [PATCH] Remove deprecated items --- docs/api.rst | 3 -- docs/usage.rst | 2 +- ultraplot/__init__.py | 6 --- ultraplot/axes/plot.py | 5 --- ultraplot/colors.py | 45 ------------------- ultraplot/config.py | 14 ------ ultraplot/constructor.py | 17 +------ ultraplot/demos.py | 1 - ultraplot/figure.py | 5 --- .../tests/test_constructor_helpers_extra.py | 5 +-- ultraplot/tests/test_imports.py | 3 +- ultraplot/utils.py | 11 ----- 12 files changed, 5 insertions(+), 112 deletions(-) diff --git a/docs/api.rst b/docs/api.rst index 5e2489e2b..d3a5f3bb3 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -68,7 +68,6 @@ Configuration tools .. automodsumm:: ultraplot.config :toctree: api - :skip: inline_backend_fmt, RcConfigurator Constructor functions @@ -79,7 +78,6 @@ Constructor functions .. automodsumm:: ultraplot.constructor :toctree: api - :skip: Colors Locators and formatters @@ -110,7 +108,6 @@ Colormaps and normalizers .. automodsumm:: ultraplot.colors :toctree: api - :skip: ListedColormap, LinearSegmentedColormap, PerceptuallyUniformColormap, LinearSegmentedNorm Projection classes diff --git a/docs/usage.rst b/docs/usage.rst index f70d90a6f..298c12132 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -243,5 +243,5 @@ classes and :ref:`constructor functions `. :ref:`modifying individual settings, changing settings in bulk, and temporarily changing settings in context blocks `. It also introduces several :ref:`new setings ` - and sets up the inline plotting backend with :func:`~ultraplot.config.inline_backend_fmt` + and sets up the inline plotting backend with :func:`~ultraplot.config.config_inline_backend` so that your inline figures look the same as your saved figures. diff --git a/ultraplot/__init__.py b/ultraplot/__init__.py index 0632ecfec..cd9b5d467 100644 --- a/ultraplot/__init__.py +++ b/ultraplot/__init__.py @@ -34,11 +34,7 @@ from .colors import DiscreteColormap as DiscreteColormap from .colors import DiscreteNorm as DiscreteNorm from .colors import DivergingNorm as DivergingNorm - from .colors import LinearSegmentedColormap as LinearSegmentedColormap - from .colors import LinearSegmentedNorm as LinearSegmentedNorm - from .colors import ListedColormap as ListedColormap from .colors import PerceptualColormap as PerceptualColormap - from .colors import PerceptuallyUniformColormap as PerceptuallyUniformColormap from .colors import SegmentedNorm as SegmentedNorm from .colors import _cmap_database as colormaps from .config import config_inline_backend as config_inline_backend @@ -138,14 +134,12 @@ from .utils import edges as edges from .utils import edges2d as edges2d from .utils import get_colors as get_colors - from .utils import saturate as saturate from .utils import scale_luminance as scale_luminance from .utils import scale_saturation as scale_saturation from .utils import set_alpha as set_alpha from .utils import set_hue as set_hue from .utils import set_luminance as set_luminance from .utils import set_saturation as set_saturation - from .utils import shade as shade from .utils import shift_hue as shift_hue from .utils import to_hex as to_hex from .utils import to_rgb as to_rgb diff --git a/ultraplot/axes/plot.py b/ultraplot/axes/plot.py index 48254187e..6bd62acaf 100644 --- a/ultraplot/axes/plot.py +++ b/ultraplot/axes/plot.py @@ -4063,7 +4063,6 @@ def _scatter_c_is_scalar_data( return False return values.shape[0] == point_count - @warnings._rename_kwargs("0.6.0", centers="values") def _parse_cmap( self, *args, @@ -7703,9 +7702,5 @@ def _iter_arg_cols(self, *args, label=None, labels=None, values=None, **kwargs): # Related parsing functions for warnings _level_parsers = (_parse_level_vals, _parse_level_num, _parse_level_lim) - # Rename the shorthands - boxes = warnings._rename_objs("0.8.0", boxes=box) - violins = warnings._rename_objs("0.8.0", violins=violin) - # mock commit diff --git a/ultraplot/colors.py b/ultraplot/colors.py index bab2f5c7a..08e4a655d 100644 --- a/ultraplot/colors.py +++ b/ultraplot/colors.py @@ -71,10 +71,6 @@ def _cycle_handler(value): "SegmentedNorm", "ColorDatabase", "ColormapDatabase", - "ListedColormap", # deprecated - "LinearSegmentedColormap", # deprecated - "PerceptuallyUniformColormap", # deprecated - "LinearSegmentedNorm", # deprecated ] # Default colormap properties @@ -1689,16 +1685,6 @@ def from_list(cls, *args, **kwargs): cdict[key] = _make_segment_data(values, coords, ratios) return cls(name, cdict, **kwargs) - # Deprecated - to_listed = warnings._rename_objs("0.8.0", to_listed=to_discrete) - concatenate, punched, truncated, updated = warnings._rename_objs( - "0.6.0", - concatenate=append, - punched=cut, - truncated=truncate, - updated=copy, - ) - class DiscreteColormap(mcolors.ListedColormap, _Colormap): r""" @@ -1987,14 +1973,6 @@ def from_file(cls, path, *, warn_on_failure=False): """ return cls._from_file(path, warn_on_failure=warn_on_failure) - # Rename methods - concatenate, truncated, updated = warnings._rename_objs( - "0.6.0", - concatenate=append, - truncated=truncate, - updated=copy, - ) - class PerceptualColormap(ContinuousColormap): """ @@ -2224,7 +2202,6 @@ def to_continuous(self, name=None, **kwargs): @classmethod @docstring._snippet_manager - @warnings._rename_kwargs("0.7.0", fade="saturation", shade="luminance") def from_color(cls, *args, **kwargs): """ Return a simple monochromatic "sequential" colormap that blends from white @@ -2420,11 +2397,6 @@ def from_list(cls, *args, adjust_grays=True, **kwargs): return cls(name, cdict, **kwargs) - # Deprecated - to_linear_segmented = warnings._rename_objs( - "0.8.0", to_linear_segmented=to_continuous - ) - def _interpolate_scalar(x, x0, x1, y0, y1): """ @@ -2490,9 +2462,6 @@ class DiscreteNorm(mcolors.BoundaryNorm): # WARNING: Must be child of BoundaryNorm. Many methods in ColorBarBase # test for class membership, crucially including _process_values(), which # if it doesn't detect BoundaryNorm will try to use DiscreteNorm.inverse(). - @warnings._rename_kwargs( - "0.7.0", extend="unique", descending="DiscreteNorm(descending_levels)" - ) def __init__( self, levels, @@ -3325,17 +3294,3 @@ def register_lazy(self, name, path, type, is_default=False): # Initialize databases _cmap_database = _init_cmap_database() _color_database = _init_color_database() - -# Deprecated -( - ListedColormap, - LinearSegmentedColormap, - PerceptuallyUniformColormap, - LinearSegmentedNorm, -) = warnings._rename_objs( # noqa: E501 - "0.8.0", - ListedColormap=DiscreteColormap, - LinearSegmentedColormap=ContinuousColormap, - PerceptuallyUniformColormap=PerceptualColormap, - LinearSegmentedNorm=SegmentedNorm, -) diff --git a/ultraplot/config.py b/ultraplot/config.py index b3270a492..af66ed6f9 100644 --- a/ultraplot/config.py +++ b/ultraplot/config.py @@ -56,8 +56,6 @@ "register_cycles", "register_colors", "register_fonts", - "RcConfigurator", # deprecated - "inline_backend_fmt", # deprecated ] # Constants @@ -1888,9 +1886,6 @@ def changed(self): rcdict.pop("axes.prop_cycle", None) return _filter_style_dict(rcdict, warn=False) - # Renamed methods - load_file = warnings._rename_objs("0.8.0", load_file=load) - # Initialize locations _init_user_folders() @@ -1907,12 +1902,3 @@ def changed(self): #: Instance of `Configurator`. This controls both `rc_matplotlib` and `rc_ultraplot` #: settings. See the :ref:`configuration guide ` for details. rc = Configurator() - -# Deprecated -RcConfigurator = warnings._rename_objs( - "0.8.0", - RcConfigurator=Configurator, -) -inline_backend_fmt = warnings._rename_objs( - "0.6.0", inline_backend_fmt=config_inline_backend -) diff --git a/ultraplot/constructor.py b/ultraplot/constructor.py index 1cb9e6600..04d315f69 100644 --- a/ultraplot/constructor.py +++ b/ultraplot/constructor.py @@ -41,7 +41,7 @@ ic, # noqa: F401 warnings, ) -from .utils import get_colors, to_hex, to_rgba +from .utils import to_hex, to_rgba try: from mpl_toolkits.basemap import Basemap @@ -62,7 +62,6 @@ "Colormap", "Norm", "Cycle", - "Colors", # deprecated ] # Color cycle constants @@ -482,9 +481,6 @@ def _modify_colormap(cmap, *, cut, left, right, reverse, shift, alpha, samples): return cmap -@warnings._rename_kwargs( - "0.8.0", fade="saturation", shade="luminance", to_listed="discrete" -) def Colormap( *args, name=None, @@ -711,13 +707,6 @@ def _pop_modification(key): "Colormap() requires either positional arguments or " "'hue', 'chroma', 'saturation', and/or 'luminance' keywords." ) - deprecated = {"listed": "discrete", "linear": "continuous"} - if listmode in deprecated: - oldmode, listmode = listmode, deprecated[listmode] - warnings._warn_ultraplot( - f"Please use listmode={listmode!r} instead of listmode={oldmode!r}." - "Option was renamed in v0.8 and will be removed in a future relase." - ) options = {"discrete", "continuous", "perceptual"} for key, mode in zip(("listmode", "filemode"), (listmode, filemode)): if mode not in options: @@ -1792,7 +1781,3 @@ def Proj( proj._proj_backend = backend return proj - - -# Deprecated -Colors = warnings._rename_objs("0.8.0", Colors=get_colors) diff --git a/ultraplot/demos.py b/ultraplot/demos.py index 85b010e6c..e16d5378f 100644 --- a/ultraplot/demos.py +++ b/ultraplot/demos.py @@ -602,7 +602,6 @@ def show_colorspaces(*, luminance=None, saturation=None, hue=None, refwidth=2): return fig, axs -@warnings._rename_kwargs("0.8.0", categories="include") @warnings._rename_kwargs("0.10.0", rasterize="rasterized") def _draw_bars( cmaps, diff --git a/ultraplot/figure.py b/ultraplot/figure.py index ed2955e99..60cf99014 100644 --- a/ultraplot/figure.py +++ b/ultraplot/figure.py @@ -718,13 +718,8 @@ def __repr__(self): opts = ", ".join(f"{key}={value!r}" for key, value in opts.items()) return f"Figure({geom}{opts})" - # NOTE: If _rename_kwargs argument is an invalid identifier, it is - # simply used in the warning message. @docstring._obfuscate_kwargs @docstring._snippet_manager - @warnings._rename_kwargs( - "0.7.0", axpad="innerpad", autoformat="uplt.rc.autoformat = {}" - ) @_alias_kwargs( refnum=("ref",), refaspect=("aspect",), diff --git a/ultraplot/tests/test_constructor_helpers_extra.py b/ultraplot/tests/test_constructor_helpers_extra.py index e8d464c34..7d75dc3f6 100644 --- a/ultraplot/tests/test_constructor_helpers_extra.py +++ b/ultraplot/tests/test_constructor_helpers_extra.py @@ -29,9 +29,8 @@ def fake_save(self, **kwargs): monkeypatch.setattr(pcolors.DiscreteColormap, "save", fake_save) - with pytest.warns(UltraPlotWarning, match="listmode='discrete'"): - deprecated = constructor.Colormap(["red", "blue"], listmode="listed") - assert isinstance(deprecated, pcolors.DiscreteColormap) + discrete = constructor.Colormap(["red", "blue"], listmode="discrete") + assert isinstance(discrete, pcolors.DiscreteColormap) cmap = constructor.Colormap( str(hex_path), diff --git a/ultraplot/tests/test_imports.py b/ultraplot/tests/test_imports.py index 7a2c12ff3..ff253a8d7 100644 --- a/ultraplot/tests/test_imports.py +++ b/ultraplot/tests/test_imports.py @@ -209,8 +209,7 @@ def test_type_checking_block_covers_public_all(): - Module-level scalars defined directly in ``__init__.py`` (``name``, ``version``, ``__version__``, ``setup``) — already visible to type checkers without an import. - - Deprecated ``_rename_objs`` wrappers (e.g. ``RcConfigurator``, - ``inline_backend_fmt``, ``Colors``) — their runtime type is a dynamically + - Deprecated ``_rename_objs`` wrappers — their runtime type is a dynamically generated class/function from ``internals.warnings``; they cannot be imported cleanly and are not worth exposing to type checkers. """ diff --git a/ultraplot/utils.py b/ultraplot/utils.py index d07edb9a9..a8bc4242e 100644 --- a/ultraplot/utils.py +++ b/ultraplot/utils.py @@ -39,8 +39,6 @@ "to_rgba", "to_xyza", "units", - "shade", # deprecated - "saturate", # deprecated ] UNIT_REGEX = re.compile( @@ -768,7 +766,6 @@ def _fontsize_to_pt(size): ) -@warnings._rename_kwargs("0.6.0", units="dest") def units( value, numeric=None, dest=None, *, fontsize=None, figure=None, axes=None, width=None ): @@ -1158,11 +1155,3 @@ def check_for_update(package_name: str) -> None: f"{current_version} → {latest_version}\n" f"Run: pip install -U {package_name}\033[0m" ) - - -# Deprecations -shade, saturate = warnings._rename_objs( - "0.6.0", - shade=scale_luminance, - saturate=scale_saturation, -)