Skip to content

Commit 11cddb0

Browse files
committed
In Debian, matplotlib.__version__ can be have a non-numerical suffix:
"3.10.1+dfsg1"
1 parent a7473ca commit 11cddb0

File tree

5 files changed

+19
-12
lines changed

5 files changed

+19
-12
lines changed

doc/source/users/figures/geos_partial.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
import numpy as np
33
import matplotlib as mpl
44
import matplotlib.pyplot as plt
5-
mpl_version = tuple(map(int, mpl.__version__.split(".")))
6-
axkwds = {"axisbg" if mpl_version < (2,) else "facecolor": "k"}
5+
from packaging.version import Version
6+
mpl_version = Version(mpl.__version__)
7+
axkwds = {"axisbg" if mpl_version < Version("2") else "facecolor": "k"}
78

89
fig = plt.figure()
910
# global geostationary map centered on lon_0

doc/source/users/figures/nsper_partial.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
import numpy as np
33
import matplotlib as mpl
44
import matplotlib.pyplot as plt
5-
mpl_version = tuple(map(int, mpl.__version__.split(".")))
6-
axkwds = {"axisbg" if mpl_version < (2,) else "facecolor": "k"}
5+
from packaging.version import Version
6+
mpl_version = Version(mpl.__version__)
7+
axkwds = {"axisbg" if mpl_version < Version("2") else "facecolor": "k"}
78

89
fig = plt.figure()
910
# global ortho map centered on lon_0,lat_0

doc/source/users/figures/ortho_partial.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
import numpy as np
33
import matplotlib as mpl
44
import matplotlib.pyplot as plt
5-
mpl_version = tuple(map(int, mpl.__version__.split(".")))
6-
axkwds = {"axisbg" if mpl_version < (2,) else "facecolor": "k"}
5+
from packaging.version import Version
6+
mpl_version = Version(mpl.__version__)
7+
axkwds = {"axisbg" if mpl_version < Version("2") else "facecolor": "k"}
78

89
fig = plt.figure()
910
# global ortho map centered on lon_0,lat_0

src/mpl_toolkits/basemap/__init__.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@
4343
from matplotlib.transforms import Bbox
4444
from mpl_toolkits.axes_grid1 import make_axes_locatable
4545

46+
from packaging.version import Version
47+
4648
import pyproj
4749
import _geoslib
4850
from . proj import Proj
@@ -1663,8 +1665,8 @@ def drawmapboundary(self,color='k',linewidth=1.0,fill_color=None,\
16631665
# if no fill_color given, use axes background color.
16641666
# if fill_color is string 'none', really don't fill.
16651667
if fill_color is None:
1666-
mpl_version = tuple(map(int, mpl.__version__.split(".")[:2]))
1667-
if mpl_version >= (2, 0):
1668+
mpl_version = Version(mpl.__version__)
1669+
if mpl_version >= Version("2.0"):
16681670
fill_color = ax.get_facecolor()
16691671
else:
16701672
fill_color = ax.get_axis_bgcolor()
@@ -1762,8 +1764,8 @@ def fillcontinents(self,color='0.8',lake_color=None,ax=None,zorder=None,alpha=No
17621764
# get current axes instance (if none specified).
17631765
ax = ax or self._check_ax()
17641766
# get axis background color.
1765-
mpl_version = tuple(map(int, mpl.__version__.split(".")[:2]))
1766-
if mpl_version >= (2, 0):
1767+
mpl_version = Version(mpl.__version__)
1768+
if mpl_version >= Version("2.0"):
17671769
axisbgc = ax.get_facecolor()
17681770
else:
17691771
axisbgc = ax.get_axis_bgcolor()

test/mpl_toolkits/basemap/test_Basemap.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@
1616
from mpl_toolkits.basemap import Basemap
1717
from mpl_toolkits.basemap import shiftgrid
1818

19+
from packaging.version import Version
20+
1921
try:
2022
import PIL
2123
except ImportError:
2224
PIL = None
2325

2426

25-
mpl_version = tuple(map(int, mpl.__version__.split(".")[:2]))
27+
mpl_version = Version(mpl.__version__)
2628

2729

2830
class TestMplToolkitsBasemapBasemap(unittest.TestCase):
@@ -199,7 +201,7 @@ def _test_basemap_data_warpimage(self, method, axs=None, axslen0=10):
199201
img = getattr(bmap, method)(ax=axs, scale=0.1)
200202
self.assertIsInstance(img, AxesImage)
201203

202-
flag = int(mpl_version < (3, 5))
204+
flag = int(mpl_version < Version("3.5"))
203205
axs_children = axs_obj.get_children()
204206
self.assertEqual(len(axs_children), axslen0 + 3)
205207
self.assertIsInstance(axs_children[1 - flag], Polygon)

0 commit comments

Comments
 (0)