Skip to content

Commit a47e354

Browse files
committed
Include GraalPy in docker_warmup and remove workaround for installing it late
1 parent a4410f5 commit a47e354

File tree

2 files changed

+2
-19
lines changed

2 files changed

+2
-19
lines changed

test/conftest.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,8 @@ def docker_warmup(request: pytest.FixtureRequest) -> None:
5656
images = [build_options.manylinux_images[arch] for arch in archs] + [
5757
build_options.musllinux_images[arch] for arch in archs
5858
]
59-
# exclude GraalPy as it's not a target for cibuildwheel
6059
command = (
61-
"manylinux-interpreters ensure $(manylinux-interpreters list 2>/dev/null | grep -v graalpy) &&"
60+
"manylinux-interpreters ensure-all &&"
6261
"cpython3.13 -m pip download -d /tmp setuptools wheel pytest"
6362
)
6463
for image in images:

test/test_0_basic.py

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import re
21
import textwrap
32

43
import pytest
@@ -42,22 +41,7 @@ def test(tmp_path, build_frontend_env, capfd):
4241
# Verify pip warning not shown
4342
captured = capfd.readouterr()
4443
for stream in (captured.err, captured.out):
45-
# manylinux-interpreters ensure will run pip on GraalPy as the root
46-
# user once, so we will get the warning below. We make sure it is only
47-
# because of manylinux and nothing else. We do this by checking that
48-
# the error message only occurs directly after a call to graalpy's
49-
# ensurepip in the manylinux `/opt/` directory
50-
start = 0
51-
bad_msg = "WARNING: Running pip as the 'root' user can result"
52-
assert_msg = f"{bad_msg} is only tolerated from manylinux's ensure for graalpy"
53-
for m in re.finditer(bad_msg, stream):
54-
idx = stream.rfind("/opt/", start, m.end())
55-
start = m.end()
56-
m2 = re.match(
57-
"/opt/.*/graalpy.*/bin/python -m ensurepip --default-pip", stream[idx : m.start()]
58-
)
59-
assert m2 is not None, assert_msg
60-
assert idx + m2.end() + 1 == m.start(), assert_msg
44+
assert "WARNING: Running pip as the 'root' user can result" not in stream
6145
assert "A new release of pip available" not in stream
6246

6347

0 commit comments

Comments
 (0)