Merge pull request #79 from neutrinoceros/mpl_depr

MNT: fix deprecation warnings from matplotlib

README.rst

@@ -73,12 +73,13 @@ So, for example, if one were to use the *rainforest* colormap, this could be don
     import cmasher as cmr
 
     # Import packages for plotting
+    import matplotlib as mpl
     import matplotlib.pyplot as plt
     import numpy as np
 
     # Access rainforest colormap through CMasher or MPL
     cmap = cmr.rainforest                   # CMasher
-    cmap = plt.get_cmap('cmr.rainforest')   # MPL
+    cmap = mpl.colormaps['cmr.rainforest']  # MPL
 
     # Generate some data to plot
     x = np.random.rand(100)

cmasher/cli_tools.py

@@ -10,7 +10,6 @@
 # Package imports
 import matplotlib as mpl
 import numpy as np
-from matplotlib import cm as mplcm
 
 import cmasher as cmr
 
@@ -240,7 +239,7 @@ def cli_lang_usage_r():
 def get_cmap(cmap):
     # Try to obtain the colormap from MPL
     try:
-        cmap = mplcm.get_cmap(cmap)
+        cmap = mpl.colormaps.get_cmap(cmap)
 
     # If this does not work, try to expand given cmap in setuptools-style
     except ValueError:

cmasher/colormaps/amber/amber.py

@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+import matplotlib as mpl
 from matplotlib.colors import ListedColormap
 
 # All declaration
@@ -282,5 +282,5 @@
 cmap_r = cmap.reversed()
 
 # Register (reversed) cmap in MPL
-register_cmap(cmap=cmap)
-register_cmap(cmap=cmap_r)
+mpl.colormaps.register(cmap=cmap)
+mpl.colormaps.register(cmap=cmap_r)

cmasher/colormaps/amethyst/amethyst.py

@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+import matplotlib as mpl
 from matplotlib.colors import ListedColormap
 
 # All declaration
@@ -282,5 +282,5 @@
 cmap_r = cmap.reversed()
 
 # Register (reversed) cmap in MPL
-register_cmap(cmap=cmap)
-register_cmap(cmap=cmap_r)
+mpl.colormaps.register(cmap=cmap)
+mpl.colormaps.register(cmap=cmap_r)

cmasher/colormaps/apple/apple.py

@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+import matplotlib as mpl
 from matplotlib.colors import ListedColormap
 
 # All declaration
@@ -282,5 +282,5 @@
 cmap_r = cmap.reversed()
 
 # Register (reversed) cmap in MPL
-register_cmap(cmap=cmap)
-register_cmap(cmap=cmap_r)
+mpl.colormaps.register(cmap=cmap)
+mpl.colormaps.register(cmap=cmap_r)

cmasher/colormaps/arctic/arctic.py

@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+import matplotlib as mpl
 from matplotlib.colors import ListedColormap
 
 # All declaration
@@ -282,5 +282,5 @@
 cmap_r = cmap.reversed()
 
 # Register (reversed) cmap in MPL
-register_cmap(cmap=cmap)
-register_cmap(cmap=cmap_r)
+mpl.colormaps.register(cmap=cmap)
+mpl.colormaps.register(cmap=cmap_r)

cmasher/colormaps/bubblegum/bubblegum.py

@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+import matplotlib as mpl
 from matplotlib.colors import ListedColormap
 
 # All declaration
@@ -282,5 +282,5 @@
 cmap_r = cmap.reversed()
 
 # Register (reversed) cmap in MPL
-register_cmap(cmap=cmap)
-register_cmap(cmap=cmap_r)
+mpl.colormaps.register(cmap=cmap)
+mpl.colormaps.register(cmap=cmap_r)

cmasher/colormaps/chroma/chroma.py

@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+import matplotlib as mpl
 from matplotlib.colors import ListedColormap
 
 # All declaration
@@ -282,5 +282,5 @@
 cmap_r = cmap.reversed()
 
 # Register (reversed) cmap in MPL
-register_cmap(cmap=cmap)
-register_cmap(cmap=cmap_r)
+mpl.colormaps.register(cmap=cmap)
+mpl.colormaps.register(cmap=cmap_r)

cmasher/colormaps/copper/copper.py

@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+import matplotlib as mpl
 from matplotlib.colors import ListedColormap
 
 # All declaration
@@ -536,8 +536,8 @@
 cmap_r = cmap.reversed()
 
 # Register (reversed) cmap in MPL
-register_cmap(cmap=cmap)
-register_cmap(cmap=cmap_r)
+mpl.colormaps.register(cmap=cmap)
+mpl.colormaps.register(cmap=cmap_r)
 
 # Shift the entire colormap by half of its length
 cm_data_s = list(cm_data[255:])
@@ -548,5 +548,5 @@
 cmap_s_r = cmap_s.reversed()
 
 # Register shifted versions in MPL as well
-register_cmap(cmap=cmap_s)
-register_cmap(cmap=cmap_s_r)
+mpl.colormaps.register(cmap=cmap_s)
+mpl.colormaps.register(cmap=cmap_s_r)

cmasher/colormaps/cosmic/cosmic.py

@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+import matplotlib as mpl
 from matplotlib.colors import ListedColormap
 
 # All declaration
@@ -282,5 +282,5 @@
 cmap_r = cmap.reversed()
 
 # Register (reversed) cmap in MPL
-register_cmap(cmap=cmap)
-register_cmap(cmap=cmap_r)
+mpl.colormaps.register(cmap=cmap)
+mpl.colormaps.register(cmap=cmap_r)

cmasher/colormaps/dusk/dusk.py

@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+import matplotlib as mpl
 from matplotlib.colors import ListedColormap
 
 # All declaration
@@ -282,5 +282,5 @@
 cmap_r = cmap.reversed()
 
 # Register (reversed) cmap in MPL
-register_cmap(cmap=cmap)
-register_cmap(cmap=cmap_r)
+mpl.colormaps.register(cmap=cmap)
+mpl.colormaps.register(cmap=cmap_r)

cmasher/colormaps/eclipse/eclipse.py

@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+import matplotlib as mpl
 from matplotlib.colors import ListedColormap
 
 # All declaration
@@ -282,5 +282,5 @@
 cmap_r = cmap.reversed()
 
 # Register (reversed) cmap in MPL
-register_cmap(cmap=cmap)
-register_cmap(cmap=cmap_r)
+mpl.colormaps.register(cmap=cmap)
+mpl.colormaps.register(cmap=cmap_r)

cmasher/colormaps/ember/ember.py

@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+import matplotlib as mpl
 from matplotlib.colors import ListedColormap
 
 # All declaration
@@ -282,5 +282,5 @@
 cmap_r = cmap.reversed()
 
 # Register (reversed) cmap in MPL
-register_cmap(cmap=cmap)
-register_cmap(cmap=cmap_r)
+mpl.colormaps.register(cmap=cmap)
+mpl.colormaps.register(cmap=cmap_r)

cmasher/colormaps/emerald/emerald.py

@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+import matplotlib as mpl
 from matplotlib.colors import ListedColormap
 
 # All declaration
@@ -282,5 +282,5 @@
 cmap_r = cmap.reversed()
 
 # Register (reversed) cmap in MPL
-register_cmap(cmap=cmap)
-register_cmap(cmap=cmap_r)
+mpl.colormaps.register(cmap=cmap)
+mpl.colormaps.register(cmap=cmap_r)

cmasher/colormaps/emergency/emergency.py

@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+import matplotlib as mpl
 from matplotlib.colors import ListedColormap
 
 # All declaration
@@ -536,8 +536,8 @@
 cmap_r = cmap.reversed()
 
 # Register (reversed) cmap in MPL
-register_cmap(cmap=cmap)
-register_cmap(cmap=cmap_r)
+mpl.colormaps.register(cmap=cmap)
+mpl.colormaps.register(cmap=cmap_r)
 
 # Determine central value index of the colormap
 idx = len(cm_data) // 2
@@ -551,5 +551,5 @@
 cmap_s_r = cmap_s.reversed()
 
 # Register shifted versions in MPL as well
-register_cmap(cmap=cmap_s)
-register_cmap(cmap=cmap_s_r)
+mpl.colormaps.register(cmap=cmap_s)
+mpl.colormaps.register(cmap=cmap_s_r)

cmasher/colormaps/fall/fall.py

@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+import matplotlib as mpl
 from matplotlib.colors import ListedColormap
 
 # All declaration
@@ -282,5 +282,5 @@
 cmap_r = cmap.reversed()
 
 # Register (reversed) cmap in MPL
-register_cmap(cmap=cmap)
-register_cmap(cmap=cmap_r)
+mpl.colormaps.register(cmap=cmap)
+mpl.colormaps.register(cmap=cmap_r)

cmasher/colormaps/flamingo/flamingo.py

@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+import matplotlib as mpl
 from matplotlib.colors import ListedColormap
 
 # All declaration
@@ -282,5 +282,5 @@
 cmap_r = cmap.reversed()
 
 # Register (reversed) cmap in MPL
-register_cmap(cmap=cmap)
-register_cmap(cmap=cmap_r)
+mpl.colormaps.register(cmap=cmap)
+mpl.colormaps.register(cmap=cmap_r)

cmasher/colormaps/freeze/freeze.py

@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+import matplotlib as mpl
 from matplotlib.colors import ListedColormap
 
 # All declaration
@@ -282,5 +282,5 @@
 cmap_r = cmap.reversed()
 
 # Register (reversed) cmap in MPL
-register_cmap(cmap=cmap)
-register_cmap(cmap=cmap_r)
+mpl.colormaps.register(cmap=cmap)
+mpl.colormaps.register(cmap=cmap_r)

cmasher/colormaps/fusion/fusion.py

@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+import matplotlib as mpl
 from matplotlib.colors import ListedColormap
 
 # All declaration
@@ -537,5 +537,5 @@
 cmap_r = cmap.reversed()
 
 # Register (reversed) cmap in MPL
-register_cmap(cmap=cmap)
-register_cmap(cmap=cmap_r)
+mpl.colormaps.register(cmap=cmap)
+mpl.colormaps.register(cmap=cmap_r)

cmasher/colormaps/gem/gem.py

@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+import matplotlib as mpl
 from matplotlib.colors import ListedColormap
 
 # All declaration
@@ -282,5 +282,5 @@
 cmap_r = cmap.reversed()
 
 # Register (reversed) cmap in MPL
-register_cmap(cmap=cmap)
-register_cmap(cmap=cmap_r)
+mpl.colormaps.register(cmap=cmap)
+mpl.colormaps.register(cmap=cmap_r)

cmasher/colormaps/ghostlight/ghostlight.py

@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+import matplotlib as mpl
 from matplotlib.colors import ListedColormap
 
 # All declaration
@@ -282,5 +282,5 @@
 cmap_r = cmap.reversed()
 
 # Register (reversed) cmap in MPL
-register_cmap(cmap=cmap)
-register_cmap(cmap=cmap_r)
+mpl.colormaps.register(cmap=cmap)
+mpl.colormaps.register(cmap=cmap_r)

cmasher/colormaps/gothic/gothic.py

@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+import matplotlib as mpl
 from matplotlib.colors import ListedColormap
 
 # All declaration
@@ -282,5 +282,5 @@
 cmap_r = cmap.reversed()
 
 # Register (reversed) cmap in MPL
-register_cmap(cmap=cmap)
-register_cmap(cmap=cmap_r)
+mpl.colormaps.register(cmap=cmap)
+mpl.colormaps.register(cmap=cmap_r)

cmasher/colormaps/guppy/guppy.py

@@ -1,6 +1,6 @@
 # %% IMPORTS
 # Package imports
-from matplotlib.cm import register_cmap
+import matplotlib as mpl
 from matplotlib.colors import ListedColormap
 
 # All declaration
@@ -537,5 +537,5 @@
 cmap_r = cmap.reversed()
 
 # Register (reversed) cmap in MPL
-register_cmap(cmap=cmap)
-register_cmap(cmap=cmap_r)
+mpl.colormaps.register(cmap=cmap)
+mpl.colormaps.register(cmap=cmap_r)