ENH: future proof against matplotlib's evolving API

1313e · Sep 6, 2022 · e4f99b1 · e4f99b1
1 parent 1e76ef9
commit e4f99b1
Show file tree

Hide file tree

Showing 57 changed files with 103 additions and 80 deletions.
diff --git a/cmasher/cli_tools.py b/cmasher/cli_tools.py
@@ -10,11 +10,11 @@
 
 # Package imports
 import e13tools as e13
-from matplotlib import cm as mplcm
 import numpy as np
 
 # CMasher imports
 from cmasher import __version__
+from cmasher.utils import _get_cmap
 import cmasher as cmr
 
 # All declaration
@@ -180,7 +180,7 @@ def cli_lang_usage_r():
 def get_cmap(cmap):
     # Try to obtain the colormap from MPL
     try:
-        cmap = mplcm.get_cmap(cmap)
+        cmap = _get_cmap(cmap)
 
     # If this does not work, try to expand given cmap in setuptools-style
     except ValueError:

diff --git a/cmasher/colormaps/amber/amber.py b/cmasher/colormaps/amber/amber.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/amethyst/amethyst.py b/cmasher/colormaps/amethyst/amethyst.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/apple/apple.py b/cmasher/colormaps/apple/apple.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/arctic/arctic.py b/cmasher/colormaps/arctic/arctic.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/bubblegum/bubblegum.py b/cmasher/colormaps/bubblegum/bubblegum.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/chroma/chroma.py b/cmasher/colormaps/chroma/chroma.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/copper/copper.py b/cmasher/colormaps/copper/copper.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/cosmic/cosmic.py b/cmasher/colormaps/cosmic/cosmic.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/dusk/dusk.py b/cmasher/colormaps/dusk/dusk.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/eclipse/eclipse.py b/cmasher/colormaps/eclipse/eclipse.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/ember/ember.py b/cmasher/colormaps/ember/ember.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/emerald/emerald.py b/cmasher/colormaps/emerald/emerald.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/emergency/emergency.py b/cmasher/colormaps/emergency/emergency.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/fall/fall.py b/cmasher/colormaps/fall/fall.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/flamingo/flamingo.py b/cmasher/colormaps/flamingo/flamingo.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/freeze/freeze.py b/cmasher/colormaps/freeze/freeze.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/fusion/fusion.py b/cmasher/colormaps/fusion/fusion.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/gem/gem.py b/cmasher/colormaps/gem/gem.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/ghostlight/ghostlight.py b/cmasher/colormaps/ghostlight/ghostlight.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/gothic/gothic.py b/cmasher/colormaps/gothic/gothic.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/guppy/guppy.py b/cmasher/colormaps/guppy/guppy.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/holly/holly.py b/cmasher/colormaps/holly/holly.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/horizon/horizon.py b/cmasher/colormaps/horizon/horizon.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/iceburn/iceburn.py b/cmasher/colormaps/iceburn/iceburn.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/infinity/infinity.py b/cmasher/colormaps/infinity/infinity.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/jungle/jungle.py b/cmasher/colormaps/jungle/jungle.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/lavender/lavender.py b/cmasher/colormaps/lavender/lavender.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/lilac/lilac.py b/cmasher/colormaps/lilac/lilac.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/neon/neon.py b/cmasher/colormaps/neon/neon.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/neutral/neutral.py b/cmasher/colormaps/neutral/neutral.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/nuclear/nuclear.py b/cmasher/colormaps/nuclear/nuclear.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/ocean/ocean.py b/cmasher/colormaps/ocean/ocean.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/pepper/pepper.py b/cmasher/colormaps/pepper/pepper.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/pride/pride.py b/cmasher/colormaps/pride/pride.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/prinsenvlag/prinsenvlag.py b/cmasher/colormaps/prinsenvlag/prinsenvlag.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/rainforest/rainforest.py b/cmasher/colormaps/rainforest/rainforest.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/redshift/redshift.py b/cmasher/colormaps/redshift/redshift.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/sapphire/sapphire.py b/cmasher/colormaps/sapphire/sapphire.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/savanna/savanna.py b/cmasher/colormaps/savanna/savanna.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/seasons/seasons.py b/cmasher/colormaps/seasons/seasons.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/seaweed/seaweed.py b/cmasher/colormaps/seaweed/seaweed.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/sepia/sepia.py b/cmasher/colormaps/sepia/sepia.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/sunburst/sunburst.py b/cmasher/colormaps/sunburst/sunburst.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/swamp/swamp.py b/cmasher/colormaps/swamp/swamp.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/torch/torch.py b/cmasher/colormaps/torch/torch.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/toxic/toxic.py b/cmasher/colormaps/toxic/toxic.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration

diff --git a/cmasher/colormaps/tree/tree.py b/cmasher/colormaps/tree/tree.py
@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+from cmasher.utils import _register_cmap as register_cmap
 from matplotlib.colors import ListedColormap
 
 # All declaration