Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit77439f1

Browse files
committed
Always use PyQT/PySide6 for GitHub CI
1 parenta413677 commit77439f1

File tree

4 files changed

+22
-23
lines changed

4 files changed

+22
-23
lines changed

‎.github/workflows/tests.yml

Lines changed: 16 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,7 @@ jobs:
110111
brew install ccache
111112
brew tap homebrew/cask-fonts
112113
brew install font-noto-sans-cjk-sc
114+
brew install --cask inkscape
113115
;;
114116
esac
115117
@@ -172,36 +174,28 @@ jobs:
172174
# (sometimes, the install appears to be successful but shared
173175
# libraries cannot be loaded at runtime, so an actual import is a
174176
# 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 &&
177+
python -m pip install --upgrade pycairo 'cairocffi>=0.8' &&
178+
echo 'Cairo is available' ||
179+
echo 'Cairo is not available'
180+
181+
# PyGObject does not install on OSX 11.6.
182+
python -m pip install --upgrade PyGObject &&
177183
python -c 'import gi; gi.require_version("Gtk", "3.0"); from gi.repository import Gtk' &&
178184
echo 'PyGObject is available' ||
179185
echo 'PyGObject is not available'
180186
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)
185187
python -mpip install --upgrade pyqt5${{ matrix.pyqt5-ver }} &&
186188
python -c 'import PyQt5.QtCore' &&
187189
echo 'PyQt5 is available' ||
188190
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
191+
python -mpip install --upgrade pyqt6 &&
192+
python -c 'import PyQt6.QtCore' &&
193+
echo 'PyQt6 is available' ||
194+
echo 'PyQt6 is not available'
195+
python -mpip install --upgrade pyside6 &&
196+
python -c 'import PySide6.QtCore' &&
197+
echo 'PySide6 is available' ||
198+
echo 'PySide6 is not available'
205199
206200
python -mpip install --upgrade \
207201
-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
importdatetime
22
fromioimportBytesIO
3+
importsys
34
importxml.etree.ElementTree
45
importxml.parsers.expat
56

67
importnumpyasnp
8+
importpytest
79

810
importmatplotlibasmpl
911
frommatplotlib.figureimportFigure
@@ -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
deftest_bold_font_output_with_none_fonttype():
7579
plt.rcParams['svg.fonttype']='none'

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp