Merge e1cf7f5 into 5353d5e

CHANGELOG.rst

@@ -13,8 +13,12 @@ v2.0.x
 latest
 ------
 
-- DOC: Expanded note on FFTLog.
-- MAINT: Use scipy through conda in CI.
+- Documentation: Expanded note on FFTLog.
+
+- Maintenance:
+
+ - Use scipy through conda in CI.
+ - Fix ``do_3d_projection`` for ``matplotlib>3.5.0``.
 
 
 v2.1.3: Random noise example

examples/educational/coordinate_system.py

@@ -101,19 +101,19 @@
 ###############################################################################
 
 class Arrow3D(FancyArrowPatch):
-    """https://stackoverflow.com/a/29188796"""
+    """https://github.com/matplotlib/matplotlib/issues/21688"""
 
     def __init__(self, xs, ys, zs):
-        FancyArrowPatch.__init__(
-                self, (0, 0), (0, 0), mutation_scale=20, lw=1.5,
+        super().__init__(
+                (0, 0), (0, 0), mutation_scale=20, lw=1.5,
                 arrowstyle='-|>', color='.2', zorder=100)
         self._verts3d = xs, ys, zs
 
-    def draw(self, renderer):
+    def do_3d_projection(self, renderer=None):
         xs3d, ys3d, zs3d = self._verts3d
-        xs, ys, _ = proj3d.proj_transform(xs3d, ys3d, zs3d, self.axes.M)
+        xs, ys, zs = proj3d.proj_transform(xs3d, ys3d, zs3d, self.axes.M)
         self.set_positions((xs[0], ys[0]), (xs[1], ys[1]))
-        FancyArrowPatch.draw(self, renderer)
+        return np.min(zs)
 
 
 ###############################################################################

requirements-dev.txt

@@ -4,15 +4,14 @@
 # SOFT DEPENDENCIES
 scooby
 # https://github.com/matplotlib/matplotlib/issues/21688
-# Keep an eye on the issue to see if it will be resolved!
-matplotlib != 3.5.0, != 3.5.1
+matplotlib != 3.5.0
 
 # SETUP RELATED
 setuptools_scm
 
 # FOR DOCUMENTATION
-sphinx > 3
-numpydoc >= 0.9
+sphinx
+numpydoc
 sphinx_panels
 sphinx_numfig
 sphinx_gallery