8000 Merge pull request #26090 from QuLogic/ubuntu22 · matplotlib/matplotlib@2d6d12d · GitHub
[go: up one dir, main page]
Skip to content

Commit 2d6d12d

Browse files
tacaswelltacaswell
authored
Merge pull request #26090 from QuLogic/ubuntu22
ci: Move Python 3.11 job to Ubuntu 22.04
2 parents dbc906a + 35e9983 commit 2d6d12d

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

‎.github/workflows/tests.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,8 @@ jobs:
7373
pyqt6-ver: '!=6.5.1'
7474
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346
7575
pyside6-ver: '!=6.5.1'
76-
- os: ubuntu-20.04
76+
- os: ubuntu-22.04
7777
python-version: '3.11'
78-
# https://github.com/matplotlib/matplotlib/pull/26052#issuecomment-1574595954
79-
pyqt6-ver: '!=6.5.1'
8078
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346
8179
pyside6-ver: '!=6.5.1'
8280
extra-requirements: '-r requirements/testing/extra.txt'
@@ -139,7 +137,9 @@ jobs:
139137
texlive-xetex \
140138
ttf-wqy-zenhei
141139
if [[ "${{ matrix.os }}" = ubuntu-20.04 ]]; then
142-
sudo apt install -yy libopengl0
140+
sudo apt-get install -yy libopengl0
141+
else # ubuntu-22.04
142+
sudo apt-get install -yy gir1.2-gtk-4.0 libnotify4
143143
fi
144144
;;
145145
macOS)
@@ -180,10 +180,10 @@ jobs:
180180
~/.cache/matplotlib
181181
!~/.cache/matplotlib/tex.cache
182182
!~/.cache/matplotlib/test_cache
183-
key: 2-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-${{ github.sha }}
183+
key: 3-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-${{ github.sha }}
184184
restore-keys: |
185-
2-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-
186-
2-${{ runner.os }}-py${{ matrix.python-version }}-mpl-
185+
3-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-
186+
3-${{ runner.os }}-py${{ matrix.python-version }}-mpl-
187187
188188
- name: Install Python dependencies
189189
run: |
@@ -233,7 +233,7 @@ jobs:
233233
echo 'PySide2 is available' ||
234234
echo 'PySide2 is not available'
235235
fi
236-
if [[ "${{ matrix.os }}" = ubuntu-20.04 ]]; then
236+
if [[ "${{ runner.os }}" != 'macOS' ]]; then
237237
python -mpip install --upgrade pyqt6${{ matrix.pyqt6-ver }} &&
238238
python -c 'import PyQt6.QtCore' &&
239239
echo 'PyQt6 is available' ||

0 commit comments

Comments
 (0)
0