Merge branch 'main' into main

pypa · Apr 14, 2024 · 1e6fb72 · 1e6fb72
2 parents c7abce2 + 664c39e
commit 1e6fb72
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 45 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -134,11 +134,11 @@ RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.10.14
 
 FROM build_cpython AS build_cpython311
 COPY build_scripts/cpython-pubkey-310-311.txt /build_scripts/cpython-pubkeys.txt
-RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.11.8
+RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.11.9
 
 FROM build_cpython AS build_cpython312
 COPY build_scripts/cpython-pubkey-312-313.txt /build_scripts/cpython-pubkeys.txt
-RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.12.2
+RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.12.3
 
 FROM build_cpython AS all_cpython
 COPY build_scripts/finalize-python.sh /build_scripts/

diff --git a/docker/build_scripts/finalize.sh b/docker/build_scripts/finalize.sh
@@ -28,13 +28,10 @@ MANYLINUX_INTERPRETERS_NO_CHECK=1 /usr/local/bin/manylinux-interpreters ensure "
 
 # Create venv for auditwheel & certifi
 TOOLS_PATH=/opt/_internal/tools
-/opt/python/cp310-cp310/bin/python -m venv $TOOLS_PATH
-source $TOOLS_PATH/bin/activate
+/opt/python/cp310-cp310/bin/python -m venv --without-pip ${TOOLS_PATH}
 
-# Install default packages
-pip install -U --require-hashes -r $MY_DIR/requirements3.10.txt
 # Install certifi and pipx
-pip install -U --require-hashes -r $MY_DIR/requirements-base-tools.txt
+/opt/python/cp310-cp310/bin/python -m pip --python ${TOOLS_PATH}/bin/python install -U --require-hashes -r ${MY_DIR}/requirements-base-tools.txt
 
 # Make pipx available in PATH,
 # Make sure when root installs apps, they're also in the PATH
@@ -55,13 +52,10 @@ chmod 755 /usr/local/bin/pipx
 #   (https://github.com/pypa/manylinux/issues/53)
 # And it's not clear how up-to-date that is anyway
 # So let's just use the same one pip and everyone uses
-ln -s $(python -c 'import certifi; print(certifi.where())') /opt/_internal/certs.pem
+ln -s $(${TOOLS_PATH}/bin/python -c 'import certifi; print(certifi.where())') /opt/_internal/certs.pem
 # If you modify this line you also have to modify the versions in the Dockerfiles:
 export SSL_CERT_FILE=/opt/_internal/certs.pem
 
-# Deactivate the tools virtual environment
-deactivate
-
 # install other tools with pipx
 pushd $MY_DIR/requirements-tools
 for TOOL_PATH in $(find . -type f); do

diff --git a/docker/build_scripts/requirements-tools/cmake b/docker/build_scripts/requirements-tools/cmake
@@ -4,22 +4,22 @@
 #
 #    nox -s update_python_tools
 #
-cmake==3.28.4 \
-    --hash=sha256:0c615eba2dc0381675351ccff1485249afb3b3ca3735b6af1b74fef5ef446d1c \
-    --hash=sha256:213633f9e11c46dccc955169c4b1bac1775c1c9bfca99e393a7bd97bec3b5d11 \
-    --hash=sha256:58e8de07e5f1b6dae1b211ce6c7ddfa0aa2fac30676947902c31919c74d765f3 \
-    --hash=sha256:58f065208ed5351314d3accc5bcf88d63d6fad2be933fd364a13abdc6398e832 \
-    --hash=sha256:70e606a33cd4daba2a4ff132bf0358ebeb5f5595bba9ff24023c112604f64d81 \
-    --hash=sha256:7b874b94776d25d4c4a09b1006755c18a3ed74dc43ec887fa83a1b0e22c87c5d \
-    --hash=sha256:802a18564b27728b1251e39eebd8e414dda7c6f220848755d4402cfe8c85c181 \
-    --hash=sha256:83c7c569ce4c4a6bc57d2f2512c3ce3232a28aaf9ef1f95200368cf1e417c311 \
-    --hash=sha256:8c3a0284763c1a7cd5abbcb4bdd49c2489fe61c92e995cb963bb70eccaa5d4f9 \
-    --hash=sha256:8df18932454a0c10bc4255b71015b0cb46cb5ff815dfa7559580c0fa34d4c7bb \
-    --hash=sha256:a140a6b22fcf8c126932a358b554ee7ee780018153f55cdd8014f7bf970c2dba \
-    --hash=sha256:b45bc5d881727a6319d7f4b2b44e68e479ac76f18923a8eb551eb3869f2fe82a \
-    --hash=sha256:b9dd1010ebe951e1acce054c295d5f891a8ae12b295d158b66020c955ae861b4 \
-    --hash=sha256:bc06b483cb2bcaf78184e66ac7fd0f3bbe4ed9a690369b1e4897b19568d566dd \
-    --hash=sha256:c21d79c77f83e506f0858bbe01ac4326d3014c8c0079388bd459b905d2acd30f \
-    --hash=sha256:d642ee5e0f8e7252c75968bae3a1729dbbff6965f9dfb76d2f1611c583de14fd \
-    --hash=sha256:f1b1bde70f6467aa7f20c110ca35a80256509311c57e487c2d195c4ea0aed08b
+cmake==3.29.2 \
+    --hash=sha256:027eebe9bb74c31759581a543f27bc1828fc76e6fc45b2b48b51f27847904669 \
+    --hash=sha256:1d40c5451d6467b20a0a6015a5a6b6dc86f61b83f71f935740485b259100a34e \
+    --hash=sha256:23336c8ca01205d18d92ed8de6c54e570c352a58e378b7f9adc02ef00f433960 \
+    --hash=sha256:37222e23485338c72b7ea51f865d8c6847d519f7e2222922fb70b4896ca6e897 \
+    --hash=sha256:40aafe612b03a9fa140cca4024ba60b74cd92372f3f349d8062cba1f021e5001 \
+    --hash=sha256:6a4c1185cb2eca7263190a5754d0c9edf738d9e50bff464f78f48d0c05318e7c \
+    --hash=sha256:6ea5ce007893d7d1363e13433dde1c0c7c344372213a90ff3c56e896a335301d \
+    --hash=sha256:83b35de822ddabaaa184a7d8f9827381350c42d627689c775b214347f57c9e41 \
+    --hash=sha256:a941e26fba81cf74832c8a0e17e007452e05b6ad4941b3d2d18c75faa4a677d8 \
+    --hash=sha256:cc0e36752e581430a93e58a268e515bb4ec1373b9e9911571f2cac1d2a6b5bec \
+    --hash=sha256:db7a05df020ba67bacd3070dd1645c76ca96fabd06d6aaa63288fd845706e47a \
+    --hash=sha256:df2c63ce6d504aa4c91a42fd22d3887065ab029569691deb56ec19d0decd0ae9 \
+    --hash=sha256:e722a949f7c91084dba61f8f17a9854787182ab711ed0b84b1507b24a8e12e25 \
+    --hash=sha256:ed3108e646cd65a4e23fa1cbe8123569a29334a3f2a8ce214d871406b161bedb \
+    --hash=sha256:eeed08932c748647488280dc97ac00bcfeae5d760451105200cfe66c52ce6468 \
+    --hash=sha256:f1f087985fc2460476b0901716fbddb2fd69b7fe7bf1350e1ab5dc508d22600e \
+    --hash=sha256:f9e941e73202cfa667ee488d1d88b8a758b516dcfa2a2728e73dbdcbfbdebf57
     # via -r .nox/update_python_tools/tmp/cmake.in
diff --git a/docker/build_scripts/requirements3.10.txt b/docker/build_scripts/requirements3.10.txt
@@ -4,9 +4,9 @@
 #
 #    nox -s update_python_dependencies-3.10
 #
-build==1.1.1 \
-    --hash=sha256:8ed0851ee76e6e38adce47e4bee3b51c771d86c64cf578d0c2245567ee200e73 \
-    --hash=sha256:8eea65bb45b1aac2e734ba2cc8dad3a6d97d97901a395bd0ed3e7b46953d2a31
+build==1.2.1 \
+    --hash=sha256:526263f4870c26f26c433545579475377b2b7588b6f1eac76a001e873ae3e19d \
+    --hash=sha256:75e10f767a433d9a86e50d83f418e83efc18ede923ee5ff7df93b6cb0306c5d4
     # via -r requirements.in
 packaging==24.0 \
     --hash=sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5 \

diff --git a/docker/build_scripts/requirements3.11.txt b/docker/build_scripts/requirements3.11.txt
@@ -4,9 +4,9 @@
 #
 #    nox -s update_python_dependencies-3.11
 #
-build==1.1.1 \
-    --hash=sha256:8ed0851ee76e6e38adce47e4bee3b51c771d86c64cf578d0c2245567ee200e73 \
-    --hash=sha256:8eea65bb45b1aac2e734ba2cc8dad3a6d97d97901a395bd0ed3e7b46953d2a31
+build==1.2.1 \
+    --hash=sha256:526263f4870c26f26c433545579475377b2b7588b6f1eac76a001e873ae3e19d \
+    --hash=sha256:75e10f767a433d9a86e50d83f418e83efc18ede923ee5ff7df93b6cb0306c5d4
     # via -r requirements.in
 packaging==24.0 \
     --hash=sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5 \

diff --git a/docker/build_scripts/requirements3.12.txt b/docker/build_scripts/requirements3.12.txt
@@ -4,9 +4,9 @@
 #
 #    nox -s update_python_dependencies-3.12
 #
-build==1.1.1 \
-    --hash=sha256:8ed0851ee76e6e38adce47e4bee3b51c771d86c64cf578d0c2245567ee200e73 \
-    --hash=sha256:8eea65bb45b1aac2e734ba2cc8dad3a6d97d97901a395bd0ed3e7b46953d2a31
+build==1.2.1 \
+    --hash=sha256:526263f4870c26f26c433545579475377b2b7588b6f1eac76a001e873ae3e19d \
+    --hash=sha256:75e10f767a433d9a86e50d83f418e83efc18ede923ee5ff7df93b6cb0306c5d4
     # via -r requirements.in
 packaging==24.0 \
     --hash=sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5 \

diff --git a/docker/build_scripts/requirements3.8.txt b/docker/build_scripts/requirements3.8.txt
@@ -4,9 +4,9 @@
 #
 #    nox -s update_python_dependencies-3.8
 #
-build==1.1.1 \
-    --hash=sha256:8ed0851ee76e6e38adce47e4bee3b51c771d86c64cf578d0c2245567ee200e73 \
-    --hash=sha256:8eea65bb45b1aac2e734ba2cc8dad3a6d97d97901a395bd0ed3e7b46953d2a31
+build==1.2.1 \
+    --hash=sha256:526263f4870c26f26c433545579475377b2b7588b6f1eac76a001e873ae3e19d \
+    --hash=sha256:75e10f767a433d9a86e50d83f418e83efc18ede923ee5ff7df93b6cb0306c5d4
     # via -r requirements.in
 importlib-metadata==7.1.0 \
     --hash=sha256:30962b96c0c223483ed6cc7280e7f0199feb01a0e40cfae4d4450fc6fab1f570 \

diff --git a/docker/build_scripts/requirements3.9.txt b/docker/build_scripts/requirements3.9.txt
@@ -4,9 +4,9 @@
 #
 #    nox -s update_python_dependencies-3.9
 #
-build==1.1.1 \
-    --hash=sha256:8ed0851ee76e6e38adce47e4bee3b51c771d86c64cf578d0c2245567ee200e73 \
-    --hash=sha256:8eea65bb45b1aac2e734ba2cc8dad3a6d97d97901a395bd0ed3e7b46953d2a31
+build==1.2.1 \
+    --hash=sha256:526263f4870c26f26c433545579475377b2b7588b6f1eac76a001e873ae3e19d \
+    --hash=sha256:75e10f767a433d9a86e50d83f418e83efc18ede923ee5ff7df93b6cb0306c5d4
     # via -r requirements.in
 importlib-metadata==7.1.0 \
     --hash=sha256:30962b96c0c223483ed6cc7280e7f0199feb01a0e40cfae4d4450fc6fab1f570 \

diff --git a/requirements-base-tools.in b/requirements-base-tools.in
@@ -1,2 +1,2 @@
 certifi
-pipx
+pipx<1.5.0