fix various depcreciation issues with matplotlib and pandas

geophysics-ubonn · Jun 24, 2024 · 8b6d232 · 8b6d232
1 parent 5398899
commit 8b6d232
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/lib/reda/plotters/pseudoplots_type_3_crtomo.py b/lib/reda/plotters/pseudoplots_type_3_crtomo.py
@@ -12,6 +12,7 @@
 import reda.main.units as units
 import reda.utils.mpl
 plt, mpl = reda.utils.mpl.setup()
+mpl_version = reda.utils.mpl.get_mpl_version()
 
 CRbinaries = opt_import("crtomo.binaries")
 CRcfg = opt_import("crtomo.cfg")
@@ -38,7 +39,12 @@ def plot_pseudosection_type3(dataobj, column, log10, crmod_settings, **kwargs):
         fig, ax = plt.subplots(1, 1, figsize=figsize)
     fig = ax.get_figure()
 
-    cmap = mpl.cm.get_cmap('inferno')
+    # https://matplotlib.org/stable/api/prev_api_changes/api_changes_3.9.0.html#top-level-cmap-registration-and-access-functions-in-mpl-cm
+    if mpl_version[0] <= 3 and mpl_version[1] < 9:
+        cmap = mpl.cm.get_cmap(kwargs.get('cmap', 'inferno'))
+    else:
+        cmap = mpl.colormaps[kwargs.get('cmap', 'inferno')]
+
     if kwargs.get('do_not_saturate', False):
         cmap.set_over(
             color='r'
@@ -65,7 +71,7 @@ def plot_pseudosection_type3(dataobj, column, log10, crmod_settings, **kwargs):
     if 'rpha' not in dataobj.columns:
         rpha = np.zeros(dataobj.shape[0])
     else:
-        rpha = dataobj['rpha']
+        rpha = dataobj['rpha'].values
     data = dataobj[['a', 'b', 'm', 'n', 'r']].values
     data = np.hstack((data, rpha[:, np.newaxis]))