Skip to content

Commit 0828ec0

Browse files
committed
ci: Bump Ubuntu ARM builder to 24.04
Since earlier today, the `ubuntu-22.04-arm` image has actually been Ubuntu 24.04. Instead of working out how to fix that, switch to the newer image explicitly.
1 parent 5cdd827 commit 0828ec0

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

.github/workflows/tests.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,6 @@ jobs:
6060
extra-requirements: '-r requirements/testing/extra.txt'
6161
# https://github.com/matplotlib/matplotlib/issues/29844
6262
pygobject-ver: '<3.52.0'
63-
- os: ubuntu-22.04-arm
64-
python-version: '3.12'
65-
# https://github.com/matplotlib/matplotlib/issues/29844
66-
pygobject-ver: '<3.52.0'
6763
- name-suffix: "(Extra TeX packages)"
6864
os: ubuntu-22.04
6965
python-version: '3.13'
@@ -77,6 +73,8 @@ jobs:
7773
pygobject-ver: '<3.52.0'
7874
- os: ubuntu-24.04
7975
python-version: '3.12'
76+
- os: ubuntu-24.04-arm
77+
python-version: '3.12'
8078
- os: macos-14 # This runner is on M1 (arm64) chips.
8179
python-version: '3.11'
8280
# https://github.com/matplotlib/matplotlib/issues/29732
@@ -150,7 +148,7 @@ jobs:
150148
if [[ "${{ matrix.name-suffix }}" != '(Minimum Versions)' ]]; then
151149
sudo apt-get install -yy --no-install-recommends ffmpeg poppler-utils
152150
fi
153-
if [[ "${{ matrix.os }}" = ubuntu-22.04 || "${{ matrix.os }}" = ubuntu-22.04-arm ]]; then
151+
if [[ "${{ matrix.os }}" = ubuntu-22.04 ]]; then
154152
sudo apt-get install -yy --no-install-recommends \
155153
gir1.2-gtk-4.0 \
156154
libgirepository1.0-dev
@@ -257,7 +255,7 @@ jobs:
257255
)
258256
259257
# PyQt5 does not have any wheels for ARM on Linux.
260-
if [[ "${{ matrix.os }}" != 'ubuntu-22.04-arm' ]]; then
258+
if [[ "${{ matrix.os }}" != 'ubuntu-24.04-arm' ]]; then
261259
python -mpip install --upgrade --only-binary :all: pyqt5 &&
262260
python -c 'import PyQt5.QtCore' &&
263261
echo 'PyQt5 is available' ||
@@ -372,7 +370,7 @@ jobs:
372370
run: |
373371
if [[ "${{ runner.os }}" != 'macOS' ]]; then
374372
LCOV_IGNORE_ERRORS=',' # do not ignore any lcov errors by default
375-
if [[ "${{ matrix.os }}" = ubuntu-24.04 ]]; then
373+
if [[ "${{ matrix.os }}" = ubuntu-24.04 || "${{ matrix.os }}" = ubuntu-24.04-arm ]]; then
376374
# filter mismatch and unused-entity errors detected by lcov 2.x
377375
LCOV_IGNORE_ERRORS='mismatch,unused'
378376
fi

lib/matplotlib/tests/test_axes.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1382,7 +1382,8 @@ def test_pcolorargs_5205():
13821382
plt.pcolor(X, Y, list(Z[:-1, :-1]))
13831383

13841384

1385-
@image_comparison(['pcolormesh'], remove_text=True)
1385+
@image_comparison(['pcolormesh'], remove_text=True,
1386+
tol=0 if platform.machine() == 'x86_64' else 0.11)
13861387
def test_pcolormesh():
13871388
# Remove this line when this test image is regenerated.
13881389
plt.rcParams['pcolormesh.snap'] = False
@@ -1434,7 +1435,7 @@ def test_pcolormesh_small():
14341435

14351436
@image_comparison(['pcolormesh_alpha'], extensions=["png", "pdf"],
14361437
remove_text=True,
1437-
tol=0.2 if platform.machine() == "aarch64" else 0)
1438+
tol=0.4 if platform.machine() == "aarch64" else 0)
14381439
def test_pcolormesh_alpha():
14391440
# Remove this line when this test image is regenerated.
14401441
plt.rcParams['pcolormesh.snap'] = False

0 commit comments

Comments
 (0)