Skip to content

Commit

Permalink
Merge pull request #1745 from pypa/update-dependencies-pr
Browse files Browse the repository at this point in the history
[Bot] Update dependencies
  • Loading branch information
mayeut authored Feb 8, 2025
2 parents fa3500c + 2f25286 commit 0ae4f01
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 40 deletions.
16 changes: 8 additions & 8 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ RUN manylinux-entrypoint /build_scripts/install-build-packages.sh

FROM build_base AS build_git
COPY build_scripts/build-curl.sh /build_scripts/
RUN export CURL_ROOT=curl-8.11.1 && \
export CURL_HASH=a889ac9dbba3644271bd9d1302b5c22a088893719b72be3487bc3d401e5c4e80 && \
RUN export CURL_ROOT=curl-8.12.0 && \
export CURL_HASH=b72ec874e403c90462dc3019c5b24cc3cdd895247402bf23893b3b59419353bc && \
export CURL_DOWNLOAD_URL=https://curl.haxx.se/download && \
manylinux-entrypoint /build_scripts/build-curl.sh
COPY build_scripts/build-git.sh /build_scripts/
Expand All @@ -85,8 +85,8 @@ RUN export GIT_ROOT=git-2.48.1 && \

FROM build_base AS build_sqlite3
COPY build_scripts/build-sqlite3.sh /build_scripts/
RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3480000 && \
export SQLITE_AUTOCONF_HASH=ac992f7fca3989de7ed1fe99c16363f848794c8c32a158dafd4eb927a2e02fd5 && \
RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3490000 && \
export SQLITE_AUTOCONF_HASH=4d8bfa0b55e36951f6e5a9fb8c99f3b58990ab785c57b4f84f37d163a0672759 && \
export SQLITE_AUTOCONF_DOWNLOAD_URL=https://www.sqlite.org/2025 && \
manylinux-entrypoint /build_scripts/build-sqlite3.sh

Expand Down Expand Up @@ -148,15 +148,15 @@ RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.11.11

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.8
RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.12.9

FROM build_cpython AS build_cpython313
COPY build_scripts/cpython-pubkey-312-313.txt /build_scripts/cpython-pubkeys.txt
RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.13.1
RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.13.2

FROM build_cpython AS build_cpython313_nogil
COPY build_scripts/cpython-pubkey-312-313.txt /build_scripts/cpython-pubkeys.txt
RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.13.1 nogil
RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.13.2 nogil


FROM runtime_base
Expand All @@ -177,7 +177,7 @@ RUN --mount=type=bind,target=/build_cpython36,from=build_cpython36 \
mkdir -p /opt/_internal && \
cp -rf /build_cpython*/opt/_internal/* /opt/_internal/ && \
manylinux-entrypoint /opt/_internal/build_scripts/finalize.sh \
pp310-pypy310_pp73
pp310-pypy310_pp73 pp311-pypy311_pp73

ENV SSL_CERT_FILE=/opt/_internal/certs.pem

Expand Down
35 changes: 26 additions & 9 deletions docker/build_scripts/python_versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,36 @@
},
"pp310-pypy310_pp73": {
"x86_64": {
"version": "7.3.17",
"download_url": "https://downloads.python.org/pypy/pypy3.10-v7.3.17-linux64.tar.bz2",
"sha256": "fdcdb9b24f1a7726003586503fdeb264fd68fc37fbfcea022dcfe825a7fee18b"
"version": "7.3.18",
"download_url": "https://downloads.python.org/pypy/pypy3.10-v7.3.18-linux64.tar.bz2",
"sha256": "834ccd4544bb47112a66977add7e47f30619f74061ae990876bcba95d98c27c5"
},
"aarch64": {
"version": "7.3.17",
"download_url": "https://downloads.python.org/pypy/pypy3.10-v7.3.17-aarch64.tar.bz2",
"sha256": "53b6e5907df869c49e4eae7aca09fba16d150741097efb245892c1477d2395f2"
"version": "7.3.18",
"download_url": "https://downloads.python.org/pypy/pypy3.10-v7.3.18-aarch64.tar.bz2",
"sha256": "e843aecd48eb06b625af67891b99e3440313cfb64c6851fc37df1e5572c8ef9e"
},
"i686": {
"version": "7.3.17",
"download_url": "https://downloads.python.org/pypy/pypy3.10-v7.3.17-linux32.tar.bz2",
"sha256": "e534110e1047da37c1d586c392f74de3424f871d906a2083de6d41f2a8cc9164"
"version": "7.3.18",
"download_url": "https://downloads.python.org/pypy/pypy3.10-v7.3.18-linux32.tar.bz2",
"sha256": "34ef09a481254aad0f22bf09fd7c99efb65ffef4f79f5b4222505f55f8d9c22e"
}
},
"pp311-pypy311_pp73": {
"x86_64": {
"version": "7.3.18",
"download_url": "https://downloads.python.org/pypy/pypy3.11-v7.3.18-linux64.tar.bz2",
"sha256": "df5fa534800ff09d990e50ca4fdb02d8a06b9ed948dbcb3a09bea0739ef42de7"
},
"aarch64": {
"version": "7.3.18",
"download_url": "https://downloads.python.org/pypy/pypy3.11-v7.3.18-aarch64.tar.bz2",
"sha256": "95bc3021cb9be2aa766ecb776c215e97ae8c0dda99dd48840b40b5b87d90bc45"
},
"i686": {
"version": "7.3.18",
"download_url": "https://downloads.python.org/pypy/pypy3.11-v7.3.18-linux32.tar.bz2",
"sha256": "70357a69cdbf4ce449b5743901fcd36208e0a89eadcfb4d2ebdc9b4711a0612c"
}
}
}
38 changes: 19 additions & 19 deletions docker/build_scripts/requirements-tools/uv
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
# This file was autogenerated by uv via the following command:
# nox -s update_python_dependencies
uv==0.5.26 \
--hash=sha256:009ce3b2c7bf6a37800db5fd44d24266b2f7bcd5af9dcd96c4045f9b62802881 \
--hash=sha256:14d76399afb5b7fd3edbd8af9d80b9641146b97b571a2ec3401a0e6831c89d48 \
--hash=sha256:19cbf2eb624a7e05a5fd7644daee1860d17084706adc1d24950457b07ded19fa \
--hash=sha256:37f8e13ce8af2715bb6f8b37141913dc05bcd7a1dd91d6bb20cedac1bd217094 \
--hash=sha256:400803281738db532a0f732d20240e147e2516da768fc46a213eae62a789117c \
--hash=sha256:660da92587c6b13e9e27a533a8a9859bcada7e455f07197c9e6acefeed6fbadb \
--hash=sha256:75318d97b8f6f7394bf1c8ea3979d5fc2dde83e87cd753ead753e451f4781cd7 \
--hash=sha256:7ae96b282894eae0a62a1bd2a0b19dfc5914530caab40b941c19e2bfeac8c756 \
--hash=sha256:8e2cb8b2c2707e48ff21ebecec0c4fb66e7db54b91213c8677d8da42a2e61dee \
--hash=sha256:9738fe3f0c3f1c9702bb4f56b0e90a3ac5b2f7ae423d96b2ae6b4e4ce8f59d80 \
--hash=sha256:99e6846842baa3950a35e799c66990d0d4edd0d9693f6917c43a51fd9e6a8f79 \
--hash=sha256:9e566b8d46ec1cf54ed8b36565041650d7005251330222b8f838c8f0a7cacd8a \
--hash=sha256:b92113893468beb581e2145cdde31c511c7e43501b1f5ce216e89c706b523983 \
--hash=sha256:ce75b2ad23dc0702b54eb6cba9a709873b415d7a0afe0272f139a0a0835e7d9d \
--hash=sha256:cf814de2a294cb43bd8f79e444b37df17db0a72fd832fe53fc3addcd54fe3e6b \
--hash=sha256:d3f0c84e092cbc152c430904c452726652360b901490841fb2b227424630a3b6 \
--hash=sha256:edd8685d997b1ab54eb7735f2421ab92453654f419b3635b9cc182cf050ed89f \
--hash=sha256:f20ece2d762d67ce3e62cea07fb3c420431a868b4bcb704169b59ccdd10cc2da
uv==0.5.29 \
--hash=sha256:02ceda14892816f7db3d7d1a4a69b299817b54749036af1125ec73d8f570b52a \
--hash=sha256:05b6c8132b4054a83596aa0d85720649c6c8029188ea03f014c4bcfa77003c74 \
--hash=sha256:0e4fc5cc036afdccd8b539f826e8c4bac7acf51436c6216e81895ce5532141ac \
--hash=sha256:1631bd3269149501e851d2120a77c32430709540d44e24c9e82de1fe5ee71057 \
--hash=sha256:25e7f1850a71846b52aa8ed58640aa2082e16bc84995e8ff438e4bb916968159 \
--hash=sha256:25f12457e0898313aed2705effb53118af542bd9825a4de2214a324ddd9bf8d7 \
--hash=sha256:345f14af3944b67f1622b080fc037fa1276f921b1a8ffbe19d4c5b5e9a19a3b0 \
--hash=sha256:49f1bb38033ca49bb73cc33de06eff537b8a25cd201a29a4a4c2559535356907 \
--hash=sha256:6fbd1354d15fadff723b1eed171dab917dffa81091c12d5aedd6ff87b72f95df \
--hash=sha256:8fe93da5e7a087607396f905bf7d704e9a2073245a357871484c9281dc969be9 \
--hash=sha256:9f5fc05f3848e16a90fc9cebe2897d3d4de42f8cf2ec312b4efef45a520d54e9 \
--hash=sha256:aeb4a5698d1f09e8eab2495f77fc5fba25876b749d2dbef2f9e196f2471f86ba \
--hash=sha256:b307438a5e2df313a9ea5446d6e5af99a9b57a363fc5e68a434ef2d89cde083b \
--hash=sha256:ba16016199938f44b16ee74941bb7d95eb8e84301db7c7aad9d1f4861bb10b1c \
--hash=sha256:d19ecc416fc069fbf767b2fd022789b2d93832b8d45702e34daf714dea1e5851 \
--hash=sha256:e5165111121acb6b4924b0b2e740115706fb9ecfd3335def7c5afa8cce307996 \
--hash=sha256:e8a5e18487c33a0c29867da123ef0f035ee1ba880640fcbf8743ca80d7158ed0 \
--hash=sha256:ea6b05abfc025cb42ec27c9c8ac738909b1229e271b421f0c339eecc61df13a6
# via -r .nox/update_python_dependencies/tmp/uv.in
8 changes: 4 additions & 4 deletions tests/run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ if [ "${AUDITWHEEL_POLICY:0:10}" == "musllinux_" ]; then
EXPECTED_PYTHON_COUNT_ALL=9
else
if [ "${AUDITWHEEL_ARCH}" == "x86_64" ] || [ "${AUDITWHEEL_ARCH}" == "aarch64" ]; then
EXPECTED_PYTHON_COUNT=10
EXPECTED_PYTHON_COUNT_ALL=14
EXPECTED_PYTHON_COUNT=11
EXPECTED_PYTHON_COUNT_ALL=15
elif [ "${AUDITWHEEL_ARCH}" == "i686" ]; then
EXPECTED_PYTHON_COUNT=10
EXPECTED_PYTHON_COUNT_ALL=13
EXPECTED_PYTHON_COUNT=11
EXPECTED_PYTHON_COUNT_ALL=14
else
EXPECTED_PYTHON_COUNT=9
EXPECTED_PYTHON_COUNT_ALL=9
Expand Down

0 comments on commit 0ae4f01

Please sign in to comment.