Merge pull request #819 from vasole/mpl_3.5.0

Compatibility with matplotlib 3.5.0
vasole · Nov 25, 2021 · 9deec9a · 9deec9a
2 parents 6613cae + 0ac9a8a
commit 9deec9a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -115,13 +115,8 @@ script:
     - pip install --upgrade pip
 
     # Dependencies
-    # too slow to build fisx
-    - if [ "$TRAVIS_CPU_ARCH" == "ppc64le" ];
-      then
-          pip install fisx --pre --trusted-host www.silx.org --find-links http://www.silx.org/pub/wheelhouse/;
-      else
-          pip install fisx;
-      fi
+    # fisx from PyPi
+    - pip install fisx;
     - if [ "$TRAVIS_CPU_ARCH" == "ppc64le" ];
       then
           pip install matplotlib --pre --trusted-host www.silx.org --find-links http://www.silx.org/pub/wheelhouse/;

diff --git a/PyMca5/PyMcaGraph/backends/MatplotlibBackend.py b/PyMca5/PyMcaGraph/backends/MatplotlibBackend.py
@@ -1909,7 +1909,10 @@ def clearImages(self):
             image = self.ax.images[i]
             image.remove()
             del image
-            del self.ax.images[i]
+            # in versions of matplotlib prior to 3.5.0
+            # the content of the if block was needed
+            if i < len(self.ax.images):
+                del self.ax.images[i]
 
         n = list(range(len(self.ax.artists)))
         n.reverse()

diff --git a/PyMca5/__init__.py b/PyMca5/__init__.py
@@ -27,7 +27,7 @@
 __contact__ = "sole@esrf.fr"
 __license__ = "MIT"
 __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
-__version__ = "5.6.6"
+__version__ = "5.6.7"
 
 import os
 import sys

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,8 @@
+VERSION 5.6.7
+-------------
+
+- Graphics. Fast XRF fitting results visualization not working with matplotlib 3.5.0
+
 VERSION 5.6.6
 -------------