Always use PyQT/PySide6 for GitHub CI

oscargus · tacaswell · commit cd81e51bc606 · 2022-08-19T15:47:34.000-04:00
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -50,6 +50,7 @@ jobs:
             extra-requirements: '-r requirements/testing/extra.txt'
           - os: macos-latest
             python-version: 3.8
+            extra-requirements: '-r requirements/testing/extra.txt'
 
     steps:
       - uses: actions/checkout@v3
@@ -110,6 +111,7 @@ jobs:
             brew install ccache
             brew tap homebrew/cask-fonts
             brew install font-noto-sans-cjk
+            brew install --cask inkscape
             ;;
           esac
 
@@ -172,36 +174,28 @@ jobs:
           # (sometimes, the install appears to be successful but shared
           # libraries cannot be loaded at runtime, so an actual import is a
           # better check).
-          # PyGObject, pycairo, and cariocffi do not install on OSX 10.12.
-           python -m pip install --upgrade pycairo 'cairocffi>=0.8' PyGObject &&
+          python -m pip install --upgrade pycairo 'cairocffi>=0.8' &&
+            echo 'Cairo is available' ||
+            echo 'Cairo is not available'
+
+          # PyGObject does not install on OSX 11.6.
+          python -m pip install --upgrade PyGObject &&
              python -c 'import gi; gi.require_version("Gtk", "3.0"); from gi.repository import Gtk' &&
              echo 'PyGObject is available' ||
              echo 'PyGObject is not available'
 
-          # There are no functioning wheels available for OSX 10.12 (as of
-          # Sept 2020) for either pyqt5 (there are only wheels for 10.13+) or
-          # pyside2 (the latest version (5.13.2) with 10.12 wheels has a
-          # fatal to us bug, it was fixed in 5.14.0 which has 10.13 wheels)
           python -mpip install --upgrade pyqt5${{ matrix.pyqt5-ver }} &&
             python -c 'import PyQt5.QtCore' &&
             echo 'PyQt5 is available' ||
             echo 'PyQt5 is not available'
-          if [[ "${{ runner.os }}" != 'macOS' ]]; then
-            python -mpip install --upgrade pyside2 &&
-              python -c 'import PySide2.QtCore' &&
-              echo 'PySide2 is available' ||
-              echo 'PySide2 is not available'
-          fi
-          if [[ "${{ matrix.os }}" = ubuntu-20.04 ]]; then
-            python -mpip install --upgrade pyqt6 &&
-              python -c 'import PyQt6.QtCore' &&
-              echo 'PyQt6 is available' ||
-              echo 'PyQt6 is not available'
-            python -mpip install --upgrade pyside6 &&
-              python -c 'import PySide6.QtCore' &&
-              echo 'PySide6 is available' ||
-              echo 'PySide6 is not available'
-          fi
+          python -mpip install --upgrade pyqt6 &&
+            python -c 'import PyQt6.QtCore' &&
+            echo 'PyQt6 is available' ||
+            echo 'PyQt6 is not available'
+          python -mpip install --upgrade pyside6 &&
+            python -c 'import PySide6.QtCore' &&
+            echo 'PySide6 is available' ||
+            echo 'PySide6 is not available'
 
           python -mpip install --upgrade \
             -f "https://extras.wxpython.org/wxPython4/extras/linux/gtk3/${{ matrix.os }}" \
diff --git a/lib/matplotlib/testing/_markers.py b/lib/matplotlib/testing/_markers.py
@@ -46,4 +46,4 @@ def _checkdep_usetex():
     reason='xelatex + pgf is required')
 needs_usetex = pytest.mark.skipif(
     not _checkdep_usetex(),
-    reason="This test needs a TeX installation")
+    reason="This test needs a TeX installation with dvipng and ghostscript")
diff --git a/lib/matplotlib/tests/test_backend_qt.py b/lib/matplotlib/tests/test_backend_qt.py
@@ -114,6 +114,7 @@ def interrupter():
         print('SUCCESS', flush=True)
 
 
+@pytest.mark.xfail(sys.platform == "darwin", reason='Fails on OSX')
 @pytest.mark.backend('QtAgg', skip_on_importerror=True)
 @pytest.mark.parametrize("target, kwargs", [
     ('show', {'block': True}),
diff --git a/lib/matplotlib/tests/test_backend_svg.py b/lib/matplotlib/tests/test_backend_svg.py
@@ -1,6 +1,7 @@
 import datetime
 from io import BytesIO
 from pathlib import Path
+import sys
 import xml.etree.ElementTree
 import xml.parsers.expat
 
@@ -74,6 +75,7 @@ def test_bold_font_output():
     ax.set_title('bold-title', fontweight='bold')
 
 
+@pytest.mark.xfail(sys.platform == "darwin", reason='Fails on OSX')
 @image_comparison(['bold_font_output_with_none_fonttype.svg'])
 def test_bold_font_output_with_none_fonttype():
     plt.rcParams['svg.fonttype'] = 'none'
