Skip to content
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

Fix for importing mpl colormaps with recent versions of matplotlib #1077

Merged
merged 5 commits into from
Dec 4, 2023
+6 −19
Merged

Fix for importing mpl colormaps with recent versions of matplotlib #1077

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
83228e1
Fix for importing mpl colormaps with recent versions of matplotlib
ejeschke Dec 2, 2023
d1b492e
remove blank line
ejeschke Dec 2, 2023
088fa76
Remove support for matplotlib < 3.4
ejeschke Dec 2, 2023
eda38e1
bump matplotlib recommended version
ejeschke Dec 2, 2023
ed8d25d
Remove code for ignoring MatplotlibDeprecationWarning
ejeschke Dec 4, 2023
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
1 change: 1 addition & 0 deletions doc/WhatsNew.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Ver 5.0.0 (unreleased)
- Fix for a logger annoyance message when mousing over far edge of image
- Updates for deprecations in numpy 2.0
- Fix for missing menubar on some versions of Qt and Mac OS X
- Fix for importing mpl colormaps with recent versions of matplotlib

Ver 4.1.0 (2022-06-30)
======================
Expand Down
16 changes: 4 additions & 12 deletions ginga/cmap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,11 @@
import warnings

import numpy as np
from astropy.utils import minversion

__all__ = ['ColorMap', 'add_cmap', 'get_cmap', 'has_cmap', 'get_names',
'matplotlib_to_ginga_cmap', 'add_matplotlib_cmap',
'add_matplotlib_cmaps']

MPL_LT_3_4 = not minversion('matplotlib', '3.4')


# Some built in colormaps

cmap_soss = (
Expand Down Expand Up @@ -13309,27 +13305,23 @@ def add_matplotlib_cmap(cm, name=None):
def add_matplotlib_cmaps(fail_on_import_error=True):
"""Add all matplotlib colormaps."""
try:
import matplotlib.pyplot as plt
from matplotlib import cm as _cm
if MPL_LT_3_4:
from matplotlib.cbook import mplDeprecation as MatplotlibDeprecationWarning
else:
from matplotlib import MatplotlibDeprecationWarning
from matplotlib import colormaps as _mpl_cm
from matplotlib import MatplotlibDeprecationWarning
except ImportError:
if fail_on_import_error:
raise
# silently fail
return

# NOTE: Update if matplotlib has new public API for this.
for name in plt.colormaps():
for name in _mpl_cm:
if not isinstance(name, str):
continue
try:
# Do not load deprecated colormaps
with warnings.catch_warnings():
warnings.simplefilter('error', MatplotlibDeprecationWarning)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the deprecation warning catching should be removed. It should no longer happen.

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pllim, because those particular color maps have been removed some time ago? I guess we can add the code back if they deprecate more color maps in the future. Wondering why they deprecated color maps...

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ejeschke , I don't follow matplotlib development closely, so not sure. But I do not see any warning now using the matplotlib I have locally. Do you?

I guess does not hurt to keep it as well.

cm = _cm.get_cmap(name)
cm = _mpl_cm[name]
add_matplotlib_cmap(cm, name=name)
except Exception as e:
if fail_on_import_error:
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ setup_requires = setuptools_scm
recommended =
python-magic>=0.4.15
scipy>=0.18.1
matplotlib>=2.1
matplotlib>=3.4
opencv-python>=4.5.4.58
exifread>=2.3.2
beautifulsoup4>=4.3.2
Expand Down