Skip to content

Commit 85dcb0c

Browse files
committed
Use Python 3.12 for tools
1 parent 49dc161 commit 85dcb0c

File tree

3 files changed

+12
-17
lines changed

3 files changed

+12
-17
lines changed

docker/build_scripts/finalize.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,18 @@ cat <<EOF > /usr/local/bin/manylinux-interpreters
3535
3636
set -euo pipefail
3737
38-
/opt/python/cp310-cp310/bin/python $MY_DIR/manylinux-interpreters.py "\$@"
38+
/opt/python/cp312-cp312/bin/python $MY_DIR/manylinux-interpreters.py "\$@"
3939
EOF
4040
chmod 755 /usr/local/bin/manylinux-interpreters
4141

4242
MANYLINUX_INTERPRETERS_NO_CHECK=1 /usr/local/bin/manylinux-interpreters ensure "$@"
4343

44-
# Create venv for auditwheel & certifi
44+
# Create venv for certifi and pipx
4545
TOOLS_PATH=/opt/_internal/tools
46-
/opt/python/cp310-cp310/bin/python -m venv --without-pip ${TOOLS_PATH}
46+
/opt/python/cp312-cp312/bin/python -m venv --without-pip ${TOOLS_PATH}
4747

4848
# Install certifi and pipx
49-
/opt/python/cp310-cp310/bin/python -m pip --python ${TOOLS_PATH}/bin/python install -U --require-hashes -r ${MY_DIR}/requirements-base-tools.txt
49+
/opt/python/cp312-cp312/bin/python -m pip --python ${TOOLS_PATH}/bin/python install -U --require-hashes -r ${MY_DIR}/requirements-base-tools.txt
5050

5151
# Make pipx available in PATH,
5252
# Make sure when root installs apps, they're also in the PATH
@@ -74,7 +74,7 @@ export SSL_CERT_FILE=/opt/_internal/certs.pem
7474

7575
# initialize shared library
7676
# workaround https://github.com/pypa/pip/issues/9243
77-
/opt/python/cp310-cp310/bin/python -m pip download --dest /tmp/pinned-wheels --require-hashes -r /opt/_internal/build_scripts/requirements3.10.txt
77+
/opt/python/cp312-cp312/bin/python -m pip download --dest /tmp/pinned-wheels --require-hashes -r /opt/_internal/build_scripts/requirements3.12.txt
7878
pipx upgrade-shared --pip-args="--no-index --find-links=/tmp/pinned-wheels"
7979

8080
# install other tools with pipx
@@ -92,7 +92,7 @@ clean_pyc /opt/_internal
9292
# remove cache
9393
rm -rf /tmp/* || true
9494

95-
hardlink -cv /opt/_internal
95+
hardlink -c /opt/_internal
9696

9797
# update system packages
9898
LC_ALL=C ${MY_DIR}/update-system-packages.sh

docker/build_scripts/requirements-base-tools.txt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,9 @@ pipx==1.7.1 \
2020
--hash=sha256:3933c43bb344e649cb28e10d357e0967ce8572f1c19caf90cf39ae95c2a0afaf \
2121
--hash=sha256:762de134e16a462be92645166d225ecef446afaef534917f5f70008d63584360
2222
# via -r requirements-base-tools.in
23-
platformdirs==4.2.2 \
24-
--hash=sha256:2d7a1657e36a80ea911db832a8a6ece5ee53d8de21edd5cc5879af6530b1bfee \
25-
--hash=sha256:38b7b51f512eed9e84a22788b4bce1de17c0adb134d6becb09836e37d8654cd3
26-
# via pipx
27-
tomli==2.0.1 \
28-
--hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc \
29-
--hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f
23+
platformdirs==4.3.2 \
24+
--hash=sha256:9e5e27a08aa095dd127b9f2e764d74254f482fef22b0970773bfba79d091ab8c \
25+
--hash=sha256:eb1c8582560b34ed4ba105009a4badf7f6f85768b30126f351328507b2beb617
3026
# via pipx
3127
userpath==1.9.2 \
3228
--hash=sha256:2cbf01a23d655a1ff8fc166dfb78da1b641d1ceabf0fe5f970767d380b14e89d \

noxfile.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import os
2-
import re
32
from pathlib import Path
43

54
import nox
@@ -34,7 +33,7 @@ def update_python_dependencies(session):
3433
)
3534

3635
# tools
37-
python_version = "3.10"
36+
python_version = "3.12"
3837
session.run(
3938
"uv", "pip", "compile",
4039
f"--python-version={python_version}",
@@ -63,7 +62,7 @@ def update_python_dependencies(session):
6362
)
6463

6564

66-
@nox.session(python="3.11", reuse_venv=True)
65+
@nox.session(python="3.12", reuse_venv=True)
6766
def update_native_dependencies(session):
6867
"Update the native dependencies"
6968
script = "tools/update_native_dependencies.py"
@@ -72,7 +71,7 @@ def update_native_dependencies(session):
7271
session.run("python", script, *session.posargs)
7372

7473

75-
@nox.session(python="3.11", reuse_venv=True)
74+
@nox.session(python="3.12", reuse_venv=True)
7675
def update_interpreters_download(session):
7776
"Update all the Python interpreters"
7877
script = "tools/update_interpreters_download.py"

0 commit comments

Comments
 (0)