Skip to content

Commit ac451c6

Browse files
committed
break: remove setuptools & wheel from images
close #1818
1 parent 7d696b8 commit ac451c6

File tree

7 files changed

+3
-35
lines changed

7 files changed

+3
-35
lines changed

README.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,6 @@ All supported images currently contain:
308308
- `pip <https://pypi.org/p/pip>`_
309309
- `build <https://pypi.org/p/build>`_
310310
- `packaging <https://pypi.org/p/packaging>`_
311-
- Before Python 3.12, `setuptools <https://pypi.org/p/setuptools>`_ and `wheel <https://pypi.org/p/wheel>`_ are also available.
312311

313312
- The manylinux-interpreters tool which allows to list all available interpreters & install ones missing from the image
314313

docker/build_scripts/finalize-one.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ elif [ -f "/usr/local/bin/cpython${PY_VER}" ]; then
3232
"/usr/local/bin/cpython${PY_VER}" -m pip --python "${PREFIX}/bin/python" install -U --require-hashes -r "${MY_DIR}/requirements${PY_VER}.txt"
3333
else
3434
"${PREFIX}/bin/python" -m ensurepip
35+
case ${PY_VER} in
36+
3.8|3.9|3.10|3.11) "${PREFIX}/bin/python" -m pip uninstall -y setuptools;;
37+
esac
3538
"${PREFIX}/bin/python" -m pip install -U --require-hashes -r "${MY_DIR}/requirements${PY_VER}.txt"
3639
fi
3740
if [ -e "${PREFIX}/bin/pip3" ] && [ ! -e "${PREFIX}/bin/pip" ]; then

docker/build_scripts/requirements3.10.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ pyproject-hooks==1.2.0 \
2222
--hash=sha256:1e859bd5c40fae9448642dd871adf459e5e2084186e8d2c2a79a824c970da1f8 \
2323
--hash=sha256:9e5c6bfa8dcc30091c74b0cf803c81fdd29d94f01992a7707bc97babb1141913
2424
# via build
25-
setuptools==80.9.0 ; python_full_version < '3.12' and implementation_name != 'graalpy' \
26-
--hash=sha256:062d34222ad13e0cc312a4c02d73f059e86a4acbfbdea8f8f76b28c99f306922 \
27-
--hash=sha256:f36b47402ecde768dbfafc46e8e4207b4360c654f1f3bb84475f0a28628fb19c
28-
# via -r requirements.in
2925
tomli==2.2.1 ; python_full_version < '3.11' \
3026
--hash=sha256:023aa114dd824ade0100497eb2318602af309e5a55595f76b626d6d9f3b7b0a6 \
3127
--hash=sha256:02abe224de6ae62c19f090f68da4e27b10af2b93213d36cf44e6e1c5abd19fdd \
@@ -60,10 +56,6 @@ tomli==2.2.1 ; python_full_version < '3.11' \
6056
--hash=sha256:ece47d672db52ac607a3d9599a9d48dcb2f2f735c6c2d1f34130085bb12b112a \
6157
--hash=sha256:f4039b9cbc3048b2416cc57ab3bda989a6fcf9b36cf8937f01a6e731b64f80d7
6258
# via build
63-
wheel==0.45.1 ; python_full_version < '3.12' \
64-
--hash=sha256:661e1abd9198507b1409a20c02106d9670b2576e916d58f520316666abca6729 \
65-
--hash=sha256:708e7481cc80179af0e556bbf0cc00b8444c7321e2700b8d8580231d13017248
66-
# via -r requirements.in
6759
zipp==3.23.0 ; python_full_version < '3.10.2' \
6860
--hash=sha256:071652d6115ed432f5ce1d34c336c0adfd6a884660d1e9712a256d3d3bd4b14e \
6961
--hash=sha256:a07157588a12518c9d4034df3fbbee09c814741a33ff63c05fa29d26a2404166

docker/build_scripts/requirements3.11.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,3 @@ pyproject-hooks==1.2.0 \
1818
--hash=sha256:1e859bd5c40fae9448642dd871adf459e5e2084186e8d2c2a79a824c970da1f8 \
1919
--hash=sha256:9e5c6bfa8dcc30091c74b0cf803c81fdd29d94f01992a7707bc97babb1141913
2020
# via build
21-
setuptools==80.9.0 ; python_full_version < '3.12' and implementation_name != 'graalpy' \
22-
--hash=sha256:062d34222ad13e0cc312a4c02d73f059e86a4acbfbdea8f8f76b28c99f306922 \
23-
--hash=sha256:f36b47402ecde768dbfafc46e8e4207b4360c654f1f3bb84475f0a28628fb19c
24-
# via -r requirements.in
25-
wheel==0.45.1 ; python_full_version < '3.12' \
26-
--hash=sha256:661e1abd9198507b1409a20c02106d9670b2576e916d58f520316666abca6729 \
27-
--hash=sha256:708e7481cc80179af0e556bbf0cc00b8444c7321e2700b8d8580231d13017248
28-
# via -r requirements.in

docker/build_scripts/requirements3.8.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ pyproject-hooks==1.2.0 \
2222
--hash=sha256:1e859bd5c40fae9448642dd871adf459e5e2084186e8d2c2a79a824c970da1f8 \
2323
--hash=sha256:9e5c6bfa8dcc30091c74b0cf803c81fdd29d94f01992a7707bc97babb1141913
2424
# via build
25-
setuptools==75.3.2 ; python_full_version < '3.12' and implementation_name != 'graalpy' \
26-
--hash=sha256:3c1383e1038b68556a382c1e8ded8887cd20141b0eb5708a6c8d277de49364f5 \
27-
--hash=sha256:90ab613b6583fc02d5369cbca13ea26ea0e182d1df2d943ee9cbe81d4c61add9
28-
# via -r requirements.in
2925
tomli==2.2.1 ; python_full_version < '3.11' \
3026
--hash=sha256:023aa114dd824ade0100497eb2318602af309e5a55595f76b626d6d9f3b7b0a6 \
3127
--hash=sha256:02abe224de6ae62c19f090f68da4e27b10af2b93213d36cf44e6e1c5abd19fdd \
@@ -60,10 +56,6 @@ tomli==2.2.1 ; python_full_version < '3.11' \
6056
--hash=sha256:ece47d672db52ac607a3d9599a9d48dcb2f2f735c6c2d1f34130085bb12b112a \
6157
--hash=sha256:f4039b9cbc3048b2416cc57ab3bda989a6fcf9b36cf8937f01a6e731b64f80d7
6258
# via build
63-
wheel==0.45.1 ; python_full_version < '3.12' \
64-
--hash=sha256:661e1abd9198507b1409a20c02106d9670b2576e916d58f520316666abca6729 \
65-
--hash=sha256:708e7481cc80179af0e556bbf0cc00b8444c7321e2700b8d8580231d13017248
66-
# via -r requirements.in
6759
zipp==3.20.2 ; python_full_version < '3.10.2' \
6860
--hash=sha256:a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350 \
6961
--hash=sha256:bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29

docker/build_scripts/requirements3.9.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ pyproject-hooks==1.2.0 \
2222
--hash=sha256:1e859bd5c40fae9448642dd871adf459e5e2084186e8d2c2a79a824c970da1f8 \
2323
--hash=sha256:9e5c6bfa8dcc30091c74b0cf803c81fdd29d94f01992a7707bc97babb1141913
2424
# via build
25-
setuptools==80.9.0 ; python_full_version < '3.12' and implementation_name != 'graalpy' \
26-
--hash=sha256:062d34222ad13e0cc312a4c02d73f059e86a4acbfbdea8f8f76b28c99f306922 \
27-
--hash=sha256:f36b47402ecde768dbfafc46e8e4207b4360c654f1f3bb84475f0a28628fb19c
28-
# via -r requirements.in
2925
tomli==2.2.1 ; python_full_version < '3.11' \
3026
--hash=sha256:023aa114dd824ade0100497eb2318602af309e5a55595f76b626d6d9f3b7b0a6 \
3127
--hash=sha256:02abe224de6ae62c19f090f68da4e27b10af2b93213d36cf44e6e1c5abd19fdd \
@@ -60,10 +56,6 @@ tomli==2.2.1 ; python_full_version < '3.11' \
6056
--hash=sha256:ece47d672db52ac607a3d9599a9d48dcb2f2f735c6c2d1f34130085bb12b112a \
6157
--hash=sha256:f4039b9cbc3048b2416cc57ab3bda989a6fcf9b36cf8937f01a6e731b64f80d7
6258
# via build
63-
wheel==0.45.1 ; python_full_version < '3.12' \
64-
--hash=sha256:661e1abd9198507b1409a20c02106d9670b2576e916d58f520316666abca6729 \
65-
--hash=sha256:708e7481cc80179af0e556bbf0cc00b8444c7321e2700b8d8580231d13017248
66-
# via -r requirements.in
6759
zipp==3.23.0 ; python_full_version < '3.10.2' \
6860
--hash=sha256:071652d6115ed432f5ce1d34c336c0adfd6a884660d1e9712a256d3d3bd4b14e \
6961
--hash=sha256:a07157588a12518c9d4034df3fbbee09c814741a33ff63c05fa29d26a2404166

requirements.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
pip ; implementation_name != 'graalpy'
2-
setuptools ; python_version < '3.12' and implementation_name != 'graalpy'
3-
wheel ; python_version < '3.12'
42
build
53
packaging

0 commit comments

Comments
 (0)