Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2f9da0c

Browse files
committed
Always use PyQT/PySide6 for GitHub CI
1 parent a413677 commit 2f9da0c

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed

.github/workflows/tests.yml

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ jobs:
5050
extra-requirements: '-r requirements/testing/extra.txt'
5151
- os: macos-latest
5252
python-version: 3.8
53+
extra-requirements: '-r requirements/testing/extra.txt'
5354

5455
steps:
5556
- uses: actions/checkout@v3
@@ -110,6 +111,8 @@ jobs:
110111
brew install ccache
111112
brew tap homebrew/cask-fonts
112113
brew install font-noto-sans-cjk-sc
114+
brew install --cask inkscape
115+
brew install ghostscript basictex
113116
;;
114117
esac
115118
@@ -172,36 +175,28 @@ jobs:
172175
# (sometimes, the install appears to be successful but shared
173176
# libraries cannot be loaded at runtime, so an actual import is a
174177
# better check).
175-
# PyGObject, pycairo, and cariocffi do not install on OSX 10.12.
176-
python -m pip install --upgrade pycairo 'cairocffi>=0.8' PyGObject &&
178+
python -m pip install --upgrade pycairo 'cairocffi>=0.8' &&
179+
echo 'Cairo is available' ||
180+
echo 'Cairo is not available'
181+
182+
# PyGObject does not install on OSX 11.6.
183+
python -m pip install --upgrade PyGObject &&
177184
python -c 'import gi; gi.require_version("Gtk", "3.0"); from gi.repository import Gtk' &&
178185
echo 'PyGObject is available' ||
179186
echo 'PyGObject is not available'
180187
181-
# There are no functioning wheels available for OSX 10.12 (as of
182-
# Sept 2020) for either pyqt5 (there are only wheels for 10.13+) or
183-
# pyside2 (the latest version (5.13.2) with 10.12 wheels has a
184-
# fatal to us bug, it was fixed in 5.14.0 which has 10.13 wheels)
185188
python -mpip install --upgrade pyqt5${{ matrix.pyqt5-ver }} &&
186189
python -c 'import PyQt5.QtCore' &&
187190
echo 'PyQt5 is available' ||
188191
echo 'PyQt5 is not available'
189-
if [[ "${{ runner.os }}" != 'macOS' ]]; then
190-
python -mpip install --upgrade pyside2 &&
191-
python -c 'import PySide2.QtCore' &&
192-
echo 'PySide2 is available' ||
193-
echo 'PySide2 is not available'
194-
fi
195-
if [[ "${{ matrix.os }}" = ubuntu-20.04 ]]; then
196-
python -mpip install --upgrade pyqt6 &&
197-
python -c 'import PyQt6.QtCore' &&
198-
echo 'PyQt6 is available' ||
199-
echo 'PyQt6 is not available'
200-
python -mpip install --upgrade pyside6 &&
201-
python -c 'import PySide6.QtCore' &&
202-
echo 'PySide6 is available' ||
203-
echo 'PySide6 is not available'
204-
fi
192+
python -mpip install --upgrade pyqt6 &&
193+
python -c 'import PyQt6.QtCore' &&
194+
echo 'PyQt6 is available' ||
195+
echo 'PyQt6 is not available'
196+
python -mpip install --upgrade pyside6 &&
197+
python -c 'import PySide6.QtCore' &&
198+
echo 'PySide6 is available' ||
199+
echo 'PySide6 is not available'
205200
206201
python -mpip install --upgrade \
207202
-f "https://extras.wxpython.org/wxPython4/extras/linux/gtk3/${{ matrix.os }}" \

lib/matplotlib/testing/_markers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ def _checkdep_usetex():
4545
reason='xelatex + pgf is required')
4646
needs_usetex = pytest.mark.skipif(
4747
not _checkdep_usetex(),
48-
reason="This test needs a TeX installation")
48+
reason="This test needs a TeX installation with dvipng and ghostscript")

lib/matplotlib/tests/test_backend_qt.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ def interrupter():
114114
print('SUCCESS', flush=True)
115115

116116

117+
@pytest.mark.skipif(sys.platform == 'darwin', reason="Does not work on darwin")
117118
@pytest.mark.backend('QtAgg', skip_on_importerror=True)
118119
@pytest.mark.parametrize("target, kwargs", [
119120
('show', {'block': True}),

lib/matplotlib/tests/test_backend_svg.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import datetime
22
from io import BytesIO
3+
import sys
34
import xml.etree.ElementTree
45
import xml.parsers.expat
56

67
import numpy as np
8+
import pytest
79

810
import matplotlib as mpl
911
from matplotlib.figure import Figure
@@ -70,6 +72,8 @@ def test_bold_font_output():
7072
ax.set_title('bold-title', fontweight='bold')
7173

7274

75+
@pytest.mark.skipif(sys.platform == 'darwin',
76+
reason="Fails on darwin")
7377
@image_comparison(['bold_font_output_with_none_fonttype.svg'])
7478
def test_bold_font_output_with_none_fonttype():
7579
plt.rcParams['svg.fonttype'] = 'none'

0 commit comments

Comments
 (0)