Skip to content

Commit 3686a8d

Browse files
stonebigstonebig
authored
Matplotlib-3.4.0 compatibility (#4878)
* Matplotlib-3.4.0 compatibility following this API change matplotlib/matplotlib#18544 * Update util.py * Update util.py
1 parent b8be99c commit 3686a8d

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

‎holoviews/plotting/mpl/util.py‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,14 @@
1313
from matplotlib.patches import Path, PathPatch
1414
from matplotlib.transforms import Bbox, TransformedBbox, Affine2D
1515
from matplotlib.rcsetup import (
16-
validate_capstyle, validate_fontsize, validate_fonttype, validate_hatch,
17-
validate_joinstyle)
16+
validate_fontsize, validate_fonttype, validate_hatch)
17+
18+
try: # starting Matplotlib 3.4.0
19+
from matplotlib._enums import CapStyle as validate_capstyle
20+
from matplotlib._enums import JoinStyle as validate_joinstyle
21+
except: # before Matplotlib 3.4.0
22+
from matplotlib.rcsetup import (
23+
validate_capstyle, validate_joinstyle)
1824

1925
try:
2026
from nc_time_axis import NetCDFTimeConverter, CalendarDateTime

0 commit comments

Comments
 (0)