Skip to content

Update to work with matplotlib=3.6 #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbednar merged 2 commits into from
Sep 30, 2022
Merged

Update to work with matplotlib=3.6 #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8373617
Update to work with matplotlib=3.6
hoxbro Aug 21, 2022
f8a689b
Added old version back for python=3.6
hoxbro Aug 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions colorcet/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,13 @@ def __setattr__(self, name, value):

try:
from matplotlib.colors import LinearSegmentedColormap, ListedColormap
from matplotlib.cm import register_cmap
except:
try:
from matplotlib import colormaps
register_cmap = lambda name, cmap: colormaps.register(cmap, name=name)
except ImportError:
# PendingDeprecationWarning from matplotlib 3.6
from matplotlib.cm import register_cmap
except ImportError:
def LinearSegmentedColormap(colorlist,name): pass
def ListedColormap(colorlist,name): pass
def register_cmap(name,cmap): pass
Expand Down
10 changes: 8 additions & 2 deletions colorcet/tests/test_matplotlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import sys

import pytest
import colorcet as cc

Expand Down Expand Up @@ -44,5 +46,9 @@ def test_matplotlib_default_colormap_plot_kbc():

@pytest.mark.parametrize('k,v', list(cc.cm.items()))
def test_get_cm(k, v):
import matplotlib.cm as mcm
assert mcm.get_cmap('cet_' + k) is v
if sys.version_info < (3, 7):
import matplotlib.cm as mcm
assert mcm.get_cmap('cet_' + k) is v
else:
from matplotlib import colormaps
assert colormaps['cet_' + k] == v