Skip to content

Diagnostics: simplify Pillow version checking #396

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
merged 1 commit into from
Apr 18, 2018
Merged

Diagnostics: simplify Pillow version checking #396

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 2 additions & 8 deletions lib/mpl_toolkits/basemap/diagnostic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,16 @@ def package_versions():
OWSLib_version = 'not installed'

try:
from PIL import VERSION as pil_version
try:
from PIL import PILLOW_VERSION as pillow_version
except ImportError:
pillow_version = 'not installed'
from PIL import __version__ as pillow_version
except ImportError:
pil_version = 'not installed'
pillow_version = 'not installed'


BasemapPackageVersions = namedtuple(
'BasemapPackageVersions',
"""Python, basemap, matplotlib,
numpy, pyproj, pyshp, PROJ4, geodesic,
GEOS, OWSLib, PIL, Pillow""")
GEOS, OWSLib, Pillow""")

return BasemapPackageVersions(
Python = sys_version,
Expand All @@ -80,7 +75,6 @@ def package_versions():
GEOS = _geoslib.__geos_version__,
# optional dependencies below
OWSLib = OWSLib_version,
PIL = pil_version,
Pillow = pillow_version)

def check_proj_inv_hammer(segfault_protection=True):
Expand Down