Merge pull request #160 from lukelbd/rename-cmapdict

Rename _cmapdict to _cmap_database

Author: lukelbd

proplot/colors.py

@@ -16,10 +16,10 @@
 from .internals import docstring, warnings, _not_none
 from .utils import to_rgb, to_xyz
 if hasattr(mcm, '_cmap_registry'):
-    _cmapdict_attr = '_cmap_registry'
+    _cmap_database_attr = '_cmap_registry'
 else:
-    _cmapdict_attr = 'cmap_d'
-_cmapdict = getattr(mcm, _cmapdict_attr)
+    _cmap_database_attr = 'cmap_d'
+_cmap_database = getattr(mcm, _cmap_database_attr)
 
 
 __all__ = [
@@ -2166,7 +2166,7 @@ def __getitem__(self, key):
             and isinstance(rgb[1], Number) and isinstance(rgb[0], str)
         ):
             try:
-                cmap = _cmapdict[rgb[0]]
+                cmap = _cmap_database[rgb[0]]
             except (TypeError, KeyError):
                 pass
             else:
@@ -2199,11 +2199,11 @@ def _get_cmap(name=None, lut=None):
     if isinstance(name, mcolors.Colormap):
         return name
     try:
-        cmap = _cmapdict[name]
+        cmap = _cmap_database[name]
     except KeyError:
         raise KeyError(
             f'Invalid colormap name {name!r}. Valid names are: '
-            + ', '.join(map(repr, _cmapdict)) + '.'
+            + ', '.join(map(repr, _cmap_database)) + '.'
         )
     if lut is not None:
         cmap = cmap._resample(lut)
@@ -2349,13 +2349,13 @@ def _sanitize_key(self, key, mirror=True):
 # Replace colormap database with custom database
 if mcm.get_cmap is not _get_cmap:
     mcm.get_cmap = _get_cmap
-if not isinstance(_cmapdict, ColormapDatabase):
-    _cmapdict = {
-        key: value for key, value in _cmapdict.items()
+if not isinstance(_cmap_database, ColormapDatabase):
+    _cmap_database = {
+        key: value for key, value in _cmap_database.items()
         if key[-2:] != '_r' and key[-8:] != '_shifted'
     }
-    _cmapdict = ColormapDatabase(_cmapdict)
-    setattr(mcm, _cmapdict_attr, _cmapdict)
+    _cmap_database = ColormapDatabase(_cmap_database)
+    setattr(mcm, _cmap_database_attr, _cmap_database)
 
 # Deprecations
 CmapDict = warnings._rename_obj('CmapDict', ColormapDatabase)

proplot/config.py

@@ -953,11 +953,11 @@ def _update_color_cycle(key, value):
     else:
         cycle, rgbcycle = value, rc_quick['rgbcycle']
     try:
-        colors = pcolors._cmapdict[cycle].colors
+        colors = pcolors._cmap_database[cycle].colors
     except (KeyError, AttributeError):
         return {}, {}, {}
         cycles = sorted(
-            name for name, cmap in pcolors._cmapdict.items()
+            name for name, cmap in pcolors._cmap_database.items()
             if isinstance(cmap, pcolors.ListedColormap)
         )
         raise ValueError(
@@ -1217,7 +1217,7 @@ def register_cmaps(user=True, default=False):
             'phase', 'graycycle', 'romao', 'broco', 'corko', 'viko',
         ):
             cmap.set_cyclic(True)
-        pcolors._cmapdict[cmap.name] = cmap
+        pcolors._cmap_database[cmap.name] = cmap
 
 
 @docstring.add_snippets
@@ -1241,7 +1241,7 @@ def register_cycles(user=True, default=False):
         cmap = pcolors.ListedColormap.from_file(path, warn_on_failure=True)
         if not cmap:
             continue
-        pcolors._cmapdict[cmap.name] = cmap
+        pcolors._cmap_database[cmap.name] = cmap
 
 
 @docstring.add_snippets
@@ -1418,10 +1418,13 @@ def register_fonts():
                 os.environ['TTFPATH'] += ':' + paths
             mfonts._rebuild()
 
-    # Remove ttc files *after* rebuild
+    # Remove ttc files and 'Thin' fonts *after* rebuild
+    # NOTE: 'Thin' filter is ugly kludge but without this matplotlib picks up on
+    # Roboto thin ttf files installed on the RTD server when compiling docs.
     mfonts.fontManager.ttflist = [
         font for font in mfonts.fontManager.ttflist
         if os.path.splitext(font.fname)[1] != '.ttc'
+        or 'Thin' in os.path.basename(font.fname)
     ]
 
 
@@ -1441,10 +1444,10 @@ def register_fonts():
 
 # Convert colormaps that *should* be LinearSegmented from Listed
 for _name in ('viridis', 'plasma', 'inferno', 'magma', 'cividis', 'twilight'):
-    _cmap = pcolors._cmapdict.get(_name, None)
+    _cmap = pcolors._cmap_database.get(_name, None)
     if _cmap and isinstance(_cmap, pcolors.ListedColormap):
-        del pcolors._cmapdict[_name]
-        pcolors._cmapdict[_name] = pcolors.LinearSegmentedColormap.from_list(
+        del pcolors._cmap_database[_name]
+        pcolors._cmap_database[_name] = pcolors.LinearSegmentedColormap.from_list(
             _name, _cmap.colors, cyclic=(_name == 'twilight')
         )
 
@@ -1472,7 +1475,7 @@ def register_fonts():
 # image.lut. We have to register colormaps and cycles first so that the 'cycle'
 # property accepts named cycles registered by ProPlot. No performance hit here.
 lut = rc['image.lut']
-for cmap in pcolors._cmapdict.values():
+for cmap in pcolors._cmap_database.values():
     if isinstance(cmap, mcolors.LinearSegmentedColormap):
         cmap.N = lut
 

proplot/constructor.py

@@ -459,7 +459,7 @@ def _parse_modification(key, value):
                     arg = pcolors.LinearSegmentedColormap.from_file(arg)
             else:
                 try:
-                    arg = pcolors._cmapdict[arg]
+                    arg = pcolors._cmap_database[arg]
                 except KeyError:
                     pass
 
@@ -507,11 +507,11 @@ def _parse_modification(key, value):
                 message = f'Invalid colormap, color cycle, or color {arg!r}.'
                 if isinstance(arg, str) and arg[:1] != '#':
                     cmaps = ', '.join(sorted(
-                        repr(key) for key, value in pcolors._cmapdict.items()
+                        repr(key) for key, value in pcolors._cmap_database.items()
                         if isinstance(value, pcolors.LinearSegmentedColormap)
                     ))
                     cycles = ', '.join(sorted(
-                        repr(key) for key, value in pcolors._cmapdict.items()
+                        repr(key) for key, value in pcolors._cmap_database.items()
                         if isinstance(value, pcolors.ListedColormap)
                     ))
                     colors = ', '.join(sorted(
@@ -562,7 +562,7 @@ def _parse_modification(key, value):
         name = cmap.name  # may have been modified by e.g. .shifted()
     else:
         cmap.name = name
-    pcolors._cmapdict[name] = cmap
+    pcolors._cmap_database[name] = cmap
     if save:
         save_kw = save_kw or {}
         cmap.save(**save_kw)

proplot/demos.py

@@ -223,7 +223,7 @@ def _draw_bars(
                 iax += 1
                 ax.set_visible(False)
                 ax = axs[iax]
-            cmap = pcolors._cmapdict[name]
+            cmap = pcolors._cmap_database[name]
             if N is not None:
                 cmap = cmap.copy(N=N)
             ax.colorbar(
@@ -662,8 +662,8 @@ def show_cmaps(*args, **kwargs):
         ]
     else:
         names = [
-            name for name in pcolors._cmapdict.keys() if
-            isinstance(pcolors._cmapdict[name], pcolors.LinearSegmentedColormap)
+            name for name in pcolors._cmap_database.keys() if
+            isinstance(pcolors._cmap_database[name], pcolors.LinearSegmentedColormap)
         ]
 
     # Return figure of colorbars
@@ -705,8 +705,8 @@ def show_cycles(*args, **kwargs):
         ]
     else:
         names = [
-            name for name in pcolors._cmapdict.keys() if
-            isinstance(pcolors._cmapdict[name], pcolors.ListedColormap)
+            name for name in pcolors._cmap_database.keys() if
+            isinstance(pcolors._cmap_database[name], pcolors.ListedColormap)
         ]
 
     # Return figure of colorbars

proplot/utils.py

@@ -4,7 +4,6 @@
 """
 import re
 import numpy as np
-import matplotlib.cm as mcm
 import matplotlib.colors as mcolors
 from matplotlib import rcParams
 from numbers import Number, Integral
@@ -364,11 +363,12 @@ def to_rgb(color, space='rgb', cycle=None, alpha=False):
     # Convert color cycle strings
     if isinstance(color, str) and re.match(r'\AC[0-9]\Z', color):
         if isinstance(cycle, str):
+            from .colors import _cmap_database
             try:
-                cycle = mcm.cmap_d[cycle].colors
+                cycle = _cmap_database[cycle].colors
             except (KeyError, AttributeError):
                 cycles = sorted(
-                    name for name, cmap in mcm.cmap_d.items()
+                    name for name, cmap in _cmap_database.items()
                     if isinstance(cmap, mcolors.ListedColormap)
                 )
                 raise ValueError(