8000 ci: rotate `ubuntu-20.04` out of roster · matplotlib/matplotlib@2dbf515 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2dbf515

Browse files
jayaddisonjayaddison
committed
ci: rotate ubuntu-20.04 out of roster
This also allows one or two Python package dependency exclusions to be removed; specifically: - a99ffa9 - 89fb6d4
1 parent a9dc9ac commit 2dbf515

File tree

1 file changed

+6
-18
lines changed

1 file changed

+6
-18
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -48,26 +48,18 @@ jobs:
4848
matrix:
4949
include:
5050
- name-suffix: "(Minimum Versions)"
51-
os: ubuntu-20.04
52-
python-version: '3.10'
51+
os: ubuntu-22.04
52+
python-version: '3.11'
5353
extra-requirements: '-c requirements/testing/minver.txt'
5454
delete-font-cache: true
55-
# Oldest versions with Py3.10 wheels.
56-
pyqt5-ver: '==5.15.5 sip==6.3.0'
57-
pyqt6-ver: '==6.2.0 PyQt6-Qt6==6.2.0'
58-
pyside2-ver: '==5.15.2.1'
59-
pyside6-ver: '==6.2.0'
60-
- os: ubuntu-20.04
61-
python-version: '3.10'
62-
extra-requirements: '-r requirements/testing/extra.txt'
63-
CFLAGS: "-fno-lto" # Ensure that disabling LTO works.
64-
# https://github.com/matplotlib/matplotlib/pull/26052#issuecomment-1574595954
6555
# https://www.riverbankcomputing.com/pipermail/pyqt/2023-November/045606.html
66-
pyqt6-ver: '!=6.5.1,!=6.6.0,!=6.7.1'
56+
pyqt6-ver: '!=6.6.0'
6757
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346
6858
pyside6-ver: '!=6.5.1'
6959
- os: ubuntu-22.04
7060
python-version: '3.11'
61+
CFLAGS: "-fno-lto" # Ensure that disabling LTO works.
62+
# https://github.com/matplotlib/matplotlib/pull/26052#issuecomment-1574595954
7163
# https://www.riverbankcomputing.com/pipermail/pyqt/2023-November/045606.html
7264
pyqt6-ver: '!=6.6.0'
7365
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346
@@ -178,11 +170,7 @@ jobs:
178170
if [[ "${{ matrix.name-suffix }}" != '(Minimum Versions)' ]]; then
179171
sudo apt-get install -yy --no-install-recommends ffmpeg poppler-utils
180172
fi
181-
if [[ "${{ matrix.os }}" = ubuntu-20.04 ]]; then
182-
sudo apt-get install -yy --no-install-recommends libopengl0
183-
else # ubuntu-22.04
184-
sudo apt-get install -yy --no-install-recommends gir1.2-gtk-4.0
185-
fi
173+
sudo apt-get install -yy --no-install-recommends gir1.2-gtk-4.0
186174
;;
187175
macOS)
188176
brew update

0 commit comments

Comments
 (0)
0