Fix broken tests using deprecated matplotlib function from 3.6.0 (closes

qiskit-community#909) (qiskit-community#910) * Fix broken tests using deprecated matplotlib function from 3.6.0
wshanks · Sep 16, 2022 · 1f6d985 · 1f6d985
1 parent 0eaef05
commit 1f6d985
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/qiskit_experiments/curve_analysis/visualization/mpl_drawer.py b/qiskit_experiments/curve_analysis/visualization/mpl_drawer.py
@@ -191,12 +191,21 @@ def format_canvas(self):
 
             # Auto-scale all axes to the first sub axis
             if ax_type == "x":
-                all_axes[0].get_shared_x_axes().join(*all_axes)
+                # get_shared_y_axes() is immutable from matplotlib>=3.6.0. Must use Axis.sharey()
+                # instead, but this can only be called once per axis. Here we call sharey  on all axes in
+                # a chain, which should have the same effect.
+                if len(all_axes) > 1:
+                    for ax1, ax2 in zip(all_axes[1:], all_axes[0:-1]):
+                        ax1.sharex(ax2)
                 all_axes[0].set_xlim(lim)
             else:
-                all_axes[0].get_shared_y_axes().join(*all_axes)
+                # get_shared_y_axes() is immutable from matplotlib>=3.6.0. Must use Axis.sharey()
+                # instead, but this can only be called once per axis. Here we call sharey  on all axes in
+                # a chain, which should have the same effect.
+                if len(all_axes) > 1:
+                    for ax1, ax2 in zip(all_axes[1:], all_axes[0:-1]):
+                        ax1.sharey(ax2)
                 all_axes[0].set_ylim(lim)
-
         # Add title
         if self.options.figure_title is not None:
             self._axis.set_title(

diff --git a/releasenotes/notes/fix-matplotlib-3.6.0-failing-test-5a747f61a9c357b4.yaml b/releasenotes/notes/fix-matplotlib-3.6.0-failing-test-5a747f61a9c357b4.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fix a bug where :class:`CurveAnalysis` tests would fail with matplotlib 3.6.0 owing to a deprecated
+    function call used in :class:`MplCurveDrawer`. The new :class:`MplCurveDrawer` no-longer uses the
+    deprecated function.
diff --git a/requirements.txt b/requirements.txt
@@ -3,7 +3,6 @@ scipy>=1.4
 qiskit-terra>=0.21.1
 qiskit-ibmq-provider>=0.16.0
 qiskit-ibm-experiment>=0.2.5
-# FIXME: Remove maximum version once bugs discussed in #909, #910, #911 have been fixed.
-matplotlib>=3.4,<3.6
+matplotlib>=3.4
 uncertainties
 lmfit