From 224e360eabaac90f2f7e8b6ea712910d583fa354 Mon Sep 17 00:00:00 2001 From: mayeut Date: Sun, 20 Jul 2025 13:37:59 +0200 Subject: [PATCH] break: remove `setuptools` & `wheel` from images close #1818 --- README.rst | 1 - docker/build_scripts/finalize-one.sh | 3 +++ docker/build_scripts/requirements3.10.txt | 8 -------- docker/build_scripts/requirements3.11.txt | 8 -------- docker/build_scripts/requirements3.8.txt | 8 -------- docker/build_scripts/requirements3.9.txt | 8 -------- requirements.in | 2 -- 7 files changed, 3 insertions(+), 35 deletions(-) diff --git a/README.rst b/README.rst index a1d87b118..45a38a34c 100644 --- a/README.rst +++ b/README.rst @@ -308,7 +308,6 @@ All supported images currently contain: - `pip `_ - `build `_ - `packaging `_ - - Before Python 3.12, `setuptools `_ and `wheel `_ are also available. - The manylinux-interpreters tool which allows to list all available interpreters & install ones missing from the image diff --git a/docker/build_scripts/finalize-one.sh b/docker/build_scripts/finalize-one.sh index 4673bab4c..c2fd069a1 100755 --- a/docker/build_scripts/finalize-one.sh +++ b/docker/build_scripts/finalize-one.sh @@ -32,6 +32,9 @@ elif [ -f "/usr/local/bin/cpython${PY_VER}" ]; then "/usr/local/bin/cpython${PY_VER}" -m pip --python "${PREFIX}/bin/python" install -U --require-hashes -r "${MY_DIR}/requirements${PY_VER}.txt" else "${PREFIX}/bin/python" -m ensurepip + case ${PY_VER} in + 3.8|3.9|3.10|3.11) "${PREFIX}/bin/python" -m pip uninstall -y setuptools;; + esac "${PREFIX}/bin/python" -m pip install -U --require-hashes -r "${MY_DIR}/requirements${PY_VER}.txt" fi if [ -e "${PREFIX}/bin/pip3" ] && [ ! -e "${PREFIX}/bin/pip" ]; then diff --git a/docker/build_scripts/requirements3.10.txt b/docker/build_scripts/requirements3.10.txt index 6e7a84a6e..92ad3375a 100644 --- a/docker/build_scripts/requirements3.10.txt +++ b/docker/build_scripts/requirements3.10.txt @@ -22,10 +22,6 @@ pyproject-hooks==1.2.0 \ --hash=sha256:1e859bd5c40fae9448642dd871adf459e5e2084186e8d2c2a79a824c970da1f8 \ --hash=sha256:9e5c6bfa8dcc30091c74b0cf803c81fdd29d94f01992a7707bc97babb1141913 # via build -setuptools==80.9.0 ; python_full_version < '3.12' and implementation_name != 'graalpy' \ - --hash=sha256:062d34222ad13e0cc312a4c02d73f059e86a4acbfbdea8f8f76b28c99f306922 \ - --hash=sha256:f36b47402ecde768dbfafc46e8e4207b4360c654f1f3bb84475f0a28628fb19c - # via -r requirements.in tomli==2.2.1 ; python_full_version < '3.11' \ --hash=sha256:023aa114dd824ade0100497eb2318602af309e5a55595f76b626d6d9f3b7b0a6 \ --hash=sha256:02abe224de6ae62c19f090f68da4e27b10af2b93213d36cf44e6e1c5abd19fdd \ @@ -60,10 +56,6 @@ tomli==2.2.1 ; python_full_version < '3.11' \ --hash=sha256:ece47d672db52ac607a3d9599a9d48dcb2f2f735c6c2d1f34130085bb12b112a \ --hash=sha256:f4039b9cbc3048b2416cc57ab3bda989a6fcf9b36cf8937f01a6e731b64f80d7 # via build -wheel==0.45.1 ; python_full_version < '3.12' \ - --hash=sha256:661e1abd9198507b1409a20c02106d9670b2576e916d58f520316666abca6729 \ - --hash=sha256:708e7481cc80179af0e556bbf0cc00b8444c7321e2700b8d8580231d13017248 - # via -r requirements.in zipp==3.23.0 ; python_full_version < '3.10.2' \ --hash=sha256:071652d6115ed432f5ce1d34c336c0adfd6a884660d1e9712a256d3d3bd4b14e \ --hash=sha256:a07157588a12518c9d4034df3fbbee09c814741a33ff63c05fa29d26a2404166 diff --git a/docker/build_scripts/requirements3.11.txt b/docker/build_scripts/requirements3.11.txt index 32bae3100..91d5a8691 100644 --- a/docker/build_scripts/requirements3.11.txt +++ b/docker/build_scripts/requirements3.11.txt @@ -18,11 +18,3 @@ pyproject-hooks==1.2.0 \ --hash=sha256:1e859bd5c40fae9448642dd871adf459e5e2084186e8d2c2a79a824c970da1f8 \ --hash=sha256:9e5c6bfa8dcc30091c74b0cf803c81fdd29d94f01992a7707bc97babb1141913 # via build -setuptools==80.9.0 ; python_full_version < '3.12' and implementation_name != 'graalpy' \ - --hash=sha256:062d34222ad13e0cc312a4c02d73f059e86a4acbfbdea8f8f76b28c99f306922 \ - --hash=sha256:f36b47402ecde768dbfafc46e8e4207b4360c654f1f3bb84475f0a28628fb19c - # via -r requirements.in -wheel==0.45.1 ; python_full_version < '3.12' \ - --hash=sha256:661e1abd9198507b1409a20c02106d9670b2576e916d58f520316666abca6729 \ - --hash=sha256:708e7481cc80179af0e556bbf0cc00b8444c7321e2700b8d8580231d13017248 - # via -r requirements.in diff --git a/docker/build_scripts/requirements3.8.txt b/docker/build_scripts/requirements3.8.txt index 1f4fe38a3..f17021327 100644 --- a/docker/build_scripts/requirements3.8.txt +++ b/docker/build_scripts/requirements3.8.txt @@ -22,10 +22,6 @@ pyproject-hooks==1.2.0 \ --hash=sha256:1e859bd5c40fae9448642dd871adf459e5e2084186e8d2c2a79a824c970da1f8 \ --hash=sha256:9e5c6bfa8dcc30091c74b0cf803c81fdd29d94f01992a7707bc97babb1141913 # via build -setuptools==75.3.2 ; python_full_version < '3.12' and implementation_name != 'graalpy' \ - --hash=sha256:3c1383e1038b68556a382c1e8ded8887cd20141b0eb5708a6c8d277de49364f5 \ - --hash=sha256:90ab613b6583fc02d5369cbca13ea26ea0e182d1df2d943ee9cbe81d4c61add9 - # via -r requirements.in tomli==2.2.1 ; python_full_version < '3.11' \ --hash=sha256:023aa114dd824ade0100497eb2318602af309e5a55595f76b626d6d9f3b7b0a6 \ --hash=sha256:02abe224de6ae62c19f090f68da4e27b10af2b93213d36cf44e6e1c5abd19fdd \ @@ -60,10 +56,6 @@ tomli==2.2.1 ; python_full_version < '3.11' \ --hash=sha256:ece47d672db52ac607a3d9599a9d48dcb2f2f735c6c2d1f34130085bb12b112a \ --hash=sha256:f4039b9cbc3048b2416cc57ab3bda989a6fcf9b36cf8937f01a6e731b64f80d7 # via build -wheel==0.45.1 ; python_full_version < '3.12' \ - --hash=sha256:661e1abd9198507b1409a20c02106d9670b2576e916d58f520316666abca6729 \ - --hash=sha256:708e7481cc80179af0e556bbf0cc00b8444c7321e2700b8d8580231d13017248 - # via -r requirements.in zipp==3.20.2 ; python_full_version < '3.10.2' \ --hash=sha256:a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350 \ --hash=sha256:bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29 diff --git a/docker/build_scripts/requirements3.9.txt b/docker/build_scripts/requirements3.9.txt index 6e7a84a6e..92ad3375a 100644 --- a/docker/build_scripts/requirements3.9.txt +++ b/docker/build_scripts/requirements3.9.txt @@ -22,10 +22,6 @@ pyproject-hooks==1.2.0 \ --hash=sha256:1e859bd5c40fae9448642dd871adf459e5e2084186e8d2c2a79a824c970da1f8 \ --hash=sha256:9e5c6bfa8dcc30091c74b0cf803c81fdd29d94f01992a7707bc97babb1141913 # via build -setuptools==80.9.0 ; python_full_version < '3.12' and implementation_name != 'graalpy' \ - --hash=sha256:062d34222ad13e0cc312a4c02d73f059e86a4acbfbdea8f8f76b28c99f306922 \ - --hash=sha256:f36b47402ecde768dbfafc46e8e4207b4360c654f1f3bb84475f0a28628fb19c - # via -r requirements.in tomli==2.2.1 ; python_full_version < '3.11' \ --hash=sha256:023aa114dd824ade0100497eb2318602af309e5a55595f76b626d6d9f3b7b0a6 \ --hash=sha256:02abe224de6ae62c19f090f68da4e27b10af2b93213d36cf44e6e1c5abd19fdd \ @@ -60,10 +56,6 @@ tomli==2.2.1 ; python_full_version < '3.11' \ --hash=sha256:ece47d672db52ac607a3d9599a9d48dcb2f2f735c6c2d1f34130085bb12b112a \ --hash=sha256:f4039b9cbc3048b2416cc57ab3bda989a6fcf9b36cf8937f01a6e731b64f80d7 # via build -wheel==0.45.1 ; python_full_version < '3.12' \ - --hash=sha256:661e1abd9198507b1409a20c02106d9670b2576e916d58f520316666abca6729 \ - --hash=sha256:708e7481cc80179af0e556bbf0cc00b8444c7321e2700b8d8580231d13017248 - # via -r requirements.in zipp==3.23.0 ; python_full_version < '3.10.2' \ --hash=sha256:071652d6115ed432f5ce1d34c336c0adfd6a884660d1e9712a256d3d3bd4b14e \ --hash=sha256:a07157588a12518c9d4034df3fbbee09c814741a33ff63c05fa29d26a2404166 diff --git a/requirements.in b/requirements.in index aeb206d6e..6c535deb5 100644 --- a/requirements.in +++ b/requirements.in @@ -1,5 +1,3 @@ pip ; implementation_name != 'graalpy' -setuptools ; python_version < '3.12' and implementation_name != 'graalpy' -wheel ; python_version < '3.12' build packaging