import nose to avoid Python 2.7/matplotlib.testing error

murrayrm · murrayrm · commit 2d1650d8d0f7 · 2021-01-12T17:13:39.000-08:00
diff --git a/.travis.yml b/.travis.yml
@@ -75,6 +75,10 @@ before_install:
   # Make sure to look in the right place for python libraries (for slycot)
   - export LIBRARY_PATH="$HOME/miniconda/envs/test-environment/lib"
   - conda install pytest
+  # matplotlib.testing.image_compare requires nose in Python 2.7
+  - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
+      conda install nose;
+    fi
   # coveralls not in conda repos => install via pip instead
   - pip install coveralls
 
diff --git a/control/tests/freqresp_test.py b/control/tests/freqresp_test.py
@@ -16,7 +16,7 @@
 from control.statesp import StateSpace
 from control.xferfcn import TransferFunction
 from control.matlab import ss, tf, bode, rss
-from control.tests.conftest import slycotonly
+from control.tests.conftest import slycotonly, nopython2
 
 from matplotlib.testing.decorators import image_comparison
 
@@ -365,6 +365,7 @@ def pvtol_inner():
     return (Pi, Ci)
 
 # Regression test for Gang of 4 plots
+@nopython2
 @image_comparison(baseline_images=['gangof4-pvtol'], extensions=['png'])
 def test_gangof4_pvtol(pvtol_inner):
     plt.figure(num=None, figsize=(8, 6), dpi=80)
