Merge pull request #1989 from SasView/mpl2_on_GH

GitHub: Freezing MPL to 2.2.5 on windows
SasView · Dec 9, 2021 · 6f4bf76 · 6f4bf76
2 parents cbf69ed + a34649a
commit 6f4bf76
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml
@@ -58,25 +58,26 @@ jobs:
           ${{ runner.os }}-pip-
 
     ### Installation of build-dependencies
+    - name: Install lxml and MPL (Linux + Win)
+      if: ${{ matrix.os != 'macos-latest' }}
+      run: |
+        python -m pip install matplotlib==2.2.5
+        python -m pip install lxml
 
     - name: Install Python dependencies
       run: |
         python -m pip install --upgrade pip
         python -m pip install wheel setuptools
 
-        python -m pip install numpy scipy matplotlib==3.4.3 docutils "pytest<6" sphinx unittest-xml-reporting
+        python -m pip install numpy scipy docutils "pytest<6" sphinx unittest-xml-reporting
         python -m pip install tinycc h5py sphinx pyparsing html5lib reportlab pybind11 appdirs
         python -m pip install six numba mako ipython qtconsole xhtml2pdf unittest-xml-reporting pylint
         python -m pip install qt5reactor periodictable PyQt5 uncertainties debugpy
 
-    - name: Install lxml (Linux + Win)
-      if: ${{ matrix.os != 'macos-latest' }}
-      run: |
-        python -m pip install lxml
-
-    - name: Install lxml (OSX)
+    - name: Install lxml and MPL (OSX)
       if: ${{ matrix.os == 'macos-latest' }}
       run: |
+        python -m pip install matplotlib==3.4.3
         python -m pip install --no-binary lxml lxml
 
     - name: Install pyopencl (Windows)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -60,24 +60,26 @@ jobs:
 
     ### Installation of build-dependencies
 
+    - name: Install lxml and MPL (Linux + Win)
+      if: ${{ matrix.os != 'macos-latest' }}
+      run: |
+        python -m pip install matplotlib==2.2.5
+        python -m pip install lxml
+
     - name: Install Python dependencies
       run: |
         python -m pip install --upgrade pip
         python -m pip install wheel setuptools
 
-        python -m pip install numpy scipy matplotlib==3.4.3 docutils "pytest<6" sphinx unittest-xml-reporting
+        python -m pip install numpy scipy docutils "pytest<6" sphinx unittest-xml-reporting
         python -m pip install tinycc h5py sphinx pyparsing html5lib reportlab pybind11 appdirs
         python -m pip install six numba mako ipython qtconsole xhtml2pdf unittest-xml-reporting pylint
         python -m pip install qt5reactor periodictable PyQt5 uncertainties debugpy
 
-    - name: Install lxml (Linux + Win)
-      if: ${{ matrix.os != 'macos-latest' }}
-      run: |
-        python -m pip install lxml
-
     - name: Install lxml (OSX)
       if: ${{ matrix.os == 'macos-latest' }}
       run: |
+        python -m pip install matplotlib==3.4.3
         python -m pip install --no-binary lxml lxml
 
     - name: Install pyopencl (Windows)