Skip to content

Commit 1c08f03

Browse files
committed
Remove setuptools & wheel pre-installed packages from python 3.12
1 parent 5b1659b commit 1c08f03

File tree

8 files changed

+13
-21
lines changed

8 files changed

+13
-21
lines changed

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ All images currently contain:
230230
- `pip <https://pypi.org/p/pip>`_
231231
- `build <https://pypi.org/p/build>`_
232232
- `packaging <https://pypi.org/p/packaging>`_
233-
- Before Python 3.12, `setuptools <https://pypi.org/p/setuptools>`_ and `wheel <https://pypi.org/p/wheel>`_ are also available. (Currently 3.12 too, but will be removed after 3.13 is released.)
233+
- Before Python 3.12, `setuptools <https://pypi.org/p/setuptools>`_ and `wheel <https://pypi.org/p/wheel>`_ are also available.
234234

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

docker/build_scripts/requirements3.10.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ pyproject-hooks==1.2.0 \
2222
--hash=sha256:1e859bd5c40fae9448642dd871adf459e5e2084186e8d2c2a79a824c970da1f8 \
2323
--hash=sha256:9e5c6bfa8dcc30091c74b0cf803c81fdd29d94f01992a7707bc97babb1141913
2424
# via build
25-
setuptools==75.2.0 ; python_full_version < '3.13' and implementation_name != 'graalpy' \
25+
setuptools==75.2.0 ; python_full_version < '3.12' and implementation_name != 'graalpy' \
2626
--hash=sha256:753bb6ebf1f465a1912e19ed1d41f403a79173a9acf66a42e7e6aec45c3c16ec \
2727
--hash=sha256:a7fcb66f68b4d9e8e66b42f9876150a3371558f98fa32222ffaa5bced76406f8
2828
# via -r requirements.in
2929
tomli==2.0.2 ; python_full_version < '3.11' \
3030
--hash=sha256:2ebe24485c53d303f690b0ec092806a085f07af5a5aa1464f3931eec36caaa38 \
3131
--hash=sha256:d46d457a85337051c36524bc5349dd91b1877838e2979ac5ced3e710ed8a60ed
3232
# via build
33-
wheel==0.44.0 ; python_full_version < '3.13' \
33+
wheel==0.44.0 ; python_full_version < '3.12' \
3434
--hash=sha256:2376a90c98cc337d18623527a97c31797bd02bad0033d41547043a1cbfbe448f \
3535
--hash=sha256:a29c3f2817e95ab89aa4660681ad547c0e9547f20e75b0562fe7723c9a2a9d49
3636
# via -r requirements.in

docker/build_scripts/requirements3.11.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ pyproject-hooks==1.2.0 \
1818
--hash=sha256:1e859bd5c40fae9448642dd871adf459e5e2084186e8d2c2a79a824c970da1f8 \
1919
--hash=sha256:9e5c6bfa8dcc30091c74b0cf803c81fdd29d94f01992a7707bc97babb1141913
2020
# via build
21-
setuptools==75.2.0 ; python_full_version < '3.13' and implementation_name != 'graalpy' \
21+
setuptools==75.2.0 ; python_full_version < '3.12' and implementation_name != 'graalpy' \
2222
--hash=sha256:753bb6ebf1f465a1912e19ed1d41f403a79173a9acf66a42e7e6aec45c3c16ec \
2323
--hash=sha256:a7fcb66f68b4d9e8e66b42f9876150a3371558f98fa32222ffaa5bced76406f8
2424
# via -r requirements.in
25-
wheel==0.44.0 ; python_full_version < '3.13' \
25+
wheel==0.44.0 ; python_full_version < '3.12' \
2626
--hash=sha256:2376a90c98cc337d18623527a97c31797bd02bad0033d41547043a1cbfbe448f \
2727
--hash=sha256:a29c3f2817e95ab89aa4660681ad547c0e9547f20e75b0562fe7723c9a2a9d49
2828
# via -r requirements.in

docker/build_scripts/requirements3.12.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==75.2.0 ; python_full_version < '3.13' and implementation_name != 'graalpy' \
22-
--hash=sha256:753bb6ebf1f465a1912e19ed1d41f403a79173a9acf66a42e7e6aec45c3c16ec \
23-
--hash=sha256:a7fcb66f68b4d9e8e66b42f9876150a3371558f98fa32222ffaa5bced76406f8
24-
# via -r requirements.in
25-
wheel==0.44.0 ; python_full_version < '3.13' \
26-
--hash=sha256:2376a90c98cc337d18623527a97c31797bd02bad0033d41547043a1cbfbe448f \
27-
--hash=sha256:a29c3f2817e95ab89aa4660681ad547c0e9547f20e75b0562fe7723c9a2a9d49
28-
# via -r requirements.in

docker/build_scripts/requirements3.7.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pyproject-hooks==1.2.0 \
2222
--hash=sha256:1e859bd5c40fae9448642dd871adf459e5e2084186e8d2c2a79a824c970da1f8 \
2323
--hash=sha256:9e5c6bfa8dcc30091c74b0cf803c81fdd29d94f01992a7707bc97babb1141913
2424
# via build
25-
setuptools==68.0.0 ; python_full_version < '3.13' and implementation_name != 'graalpy' \
25+
setuptools==68.0.0 ; python_full_version < '3.12' and implementation_name != 'graalpy' \
2626
--hash=sha256:11e52c67415a381d10d6b462ced9cfb97066179f0e871399e006c4ab101fc85f \
2727
--hash=sha256:baf1fdb41c6da4cd2eae722e135500da913332ab3f2f5c7d33af9b492acb5235
2828
# via -r requirements.in
@@ -34,7 +34,7 @@ typing-extensions==4.7.1 ; python_full_version < '3.8' \
3434
--hash=sha256:440d5dd3af93b060174bf433bccd69b0babc3b15b1a8dca43789fd7f61514b36 \
3535
--hash=sha256:b75ddc264f0ba5615db7ba217daeb99701ad295353c45f9e95963337ceeeffb2
3636
# via importlib-metadata
37-
wheel==0.42.0 ; python_full_version < '3.13' \
37+
wheel==0.42.0 ; python_full_version < '3.12' \
3838
--hash=sha256:177f9c9b0d45c47873b619f5b650346d632cdc35fb5e4d25058e09c9e581433d \
3939
--hash=sha256:c45be39f7882c9d34243236f2d63cbd58039e360f85d0913425fbd7ceea617a8
4040
# via -r requirements.in

docker/build_scripts/requirements3.8.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ pyproject-hooks==1.2.0 \
2222
--hash=sha256:1e859bd5c40fae9448642dd871adf459e5e2084186e8d2c2a79a824c970da1f8 \
2323
--hash=sha256:9e5c6bfa8dcc30091c74b0cf803c81fdd29d94f01992a7707bc97babb1141913
2424
# via build
25-
setuptools==75.2.0 ; python_full_version < '3.13' and implementation_name != 'graalpy' \
25+
setuptools==75.2.0 ; python_full_version < '3.12' and implementation_name != 'graalpy' \
2626
--hash=sha256:753bb6ebf1f465a1912e19ed1d41f403a79173a9acf66a42e7e6aec45c3c16ec \
2727
--hash=sha256:a7fcb66f68b4d9e8e66b42f9876150a3371558f98fa32222ffaa5bced76406f8
2828
# via -r requirements.in
2929
tomli==2.0.2 ; python_full_version < '3.11' \
3030
--hash=sha256:2ebe24485c53d303f690b0ec092806a085f07af5a5aa1464f3931eec36caaa38 \
3131
--hash=sha256:d46d457a85337051c36524bc5349dd91b1877838e2979ac5ced3e710ed8a60ed
3232
# via build
33-
wheel==0.44.0 ; python_full_version < '3.13' \
33+
wheel==0.44.0 ; python_full_version < '3.12' \
3434
--hash=sha256:2376a90c98cc337d18623527a97c31797bd02bad0033d41547043a1cbfbe448f \
3535
--hash=sha256:a29c3f2817e95ab89aa4660681ad547c0e9547f20e75b0562fe7723c9a2a9d49
3636
# via -r requirements.in

docker/build_scripts/requirements3.9.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ pyproject-hooks==1.2.0 \
2222
--hash=sha256:1e859bd5c40fae9448642dd871adf459e5e2084186e8d2c2a79a824c970da1f8 \
2323
--hash=sha256:9e5c6bfa8dcc30091c74b0cf803c81fdd29d94f01992a7707bc97babb1141913
2424
# via build
25-
setuptools==75.2.0 ; python_full_version < '3.13' and implementation_name != 'graalpy' \
25+
setuptools==75.2.0 ; python_full_version < '3.12' and implementation_name != 'graalpy' \
2626
--hash=sha256:753bb6ebf1f465a1912e19ed1d41f403a79173a9acf66a42e7e6aec45c3c16ec \
2727
--hash=sha256:a7fcb66f68b4d9e8e66b42f9876150a3371558f98fa32222ffaa5bced76406f8
2828
# via -r requirements.in
2929
tomli==2.0.2 ; python_full_version < '3.11' \
3030
--hash=sha256:2ebe24485c53d303f690b0ec092806a085f07af5a5aa1464f3931eec36caaa38 \
3131
--hash=sha256:d46d457a85337051c36524bc5349dd91b1877838e2979ac5ced3e710ed8a60ed
3232
# via build
33-
wheel==0.44.0 ; python_full_version < '3.13' \
33+
wheel==0.44.0 ; python_full_version < '3.12' \
3434
--hash=sha256:2376a90c98cc337d18623527a97c31797bd02bad0033d41547043a1cbfbe448f \
3535
--hash=sha256:a29c3f2817e95ab89aa4660681ad547c0e9547f20e75b0562fe7723c9a2a9d49
3636
# via -r requirements.in

requirements.in

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

0 commit comments

Comments
 (0)