ci: stick to mpl 3.2.2 because of pyinstaller/pyinstaller#5004

Author: paulmueller

.travis.yml

@@ -30,6 +30,8 @@ install:
 - travis_retry pip install scikit-learn==0.23.1
 # Pin version of scipy (1.5 did not work with PyInstaller 3.6)
 - travis_retry pip install "scipy<1.5.0"
+# Pin matplotlib to 3.2.2 (https://github.com/pyinstaller/pyinstaller/issues/5004)
+- travis_retry pip install "matplotlib==3.2.2"
 # Linux/macOS tests did not run with PyQt 5.15
 - travis_retry pip install threadpoolctl==2.0.0
 - travis_retry pip install PyQt5==5.14.2 PyQt5-sip==12.7.2

CHANGELOG

@@ -1,5 +1,5 @@
 0.8.2
- - setup: bump matplotlib to 3.3.0
+ - setup: bump matplotlib to >=3
    (NavigationToolbar2QT modifications)
 0.8.1
  - fix: correctly handle lmfit models with expressions

appveyor.yml

@@ -28,6 +28,8 @@ install:
   - appveyor-retry python -m pip install --upgrade pip
   # Pin version of scipy (1.5 did not work with PyInstaller 3.6?)
   - appveyor-retry pip install "scipy<1.5.0"
+  # Pin matplotlib to 3.2.2 (https://github.com/pyinstaller/pyinstaller/issues/5004)
+  - appveyor-retry pip install "matplotlib==3.2.2"
   # nanite needs scikit-learn>0.23.0
   - appveyor-retry python -m pip install scikit-learn==0.23.1
   - appveyor-retry pip install git+git://github.com/AFM-analysis/nanite.git

pyjibe/head/custom_widgets.py

@@ -54,7 +54,7 @@ class NavigationToolbarCustom(NavigationToolbar2QT):
     def __init__(self, *args, **kwargs):
         super(NavigationToolbarCustom, self).__init__(*args, **kwargs)
 
-    def _icon(self, name):
+    def _icon(self, name, color=None):
         """Override matplotlibs `_icon` function to get custom icons"""
         name = name.replace('.png', '_large.png')
         impath = str(cbook._get_data_path('images', name))

setup.py

@@ -27,7 +27,7 @@
     install_requires=["afmformats>=0.11.0",
                       "appdirs",
                       "nanite>=1.6.2",
-                      "matplotlib>=3.3.0",  # NavigationToolbar2QT mod
+                      "matplotlib>=3",  # NavigationToolbar2QT mod
                       "pyqt5"],
     python_requires='>=3.6, <4',
     entry_points={"gui_scripts": ['pyjibe = pyjibe.__main__:main']},