Merge pull request #1736 from pypa/update-dependencies-pr

- [Bot] Update dependencies - ci: build ARM platforms on GHA
pypa · Jan 18, 2025 · a325f1d · a325f1d
2 parents 3165879 + 97de831
commit a325f1d
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 78 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -38,22 +38,39 @@ jobs:
           python-version: "3.x"
       - uses: pre-commit/action@v3.0.1
 
+  build_matrix:
+    needs: pre_commit
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.matrix.outputs.matrix }}
+    steps:
+      - id: matrix
+        name: build matrix
+        shell: python
+        run: |
+          import os
+          import json
+          reduced = [
+              ("x86_64", "ubuntu-24.04", ("manylinux2014", "manylinux_2_28", "manylinux_2_34", "musllinux_1_2")),
+              ("aarch64", "ubuntu-24.04-arm", ("manylinux2014", "manylinux_2_28", "manylinux_2_34", "musllinux_1_2")),
+              ("i686", "ubuntu-24.04", ("manylinux2014", "musllinux_1_2")),
+              ("armv7l", "ubuntu-24.04-arm", ("musllinux_1_2",)),
+          ]
+          expanded = [{"policy": policy, "platform": platform, "runner": runner} for platform, runner, policies in reduced for policy in policies]
+          print(json.dumps(expanded, indent=2))
+          with open(os.environ["GITHUB_OUTPUT"], "at") as f:
+              f.write(f"matrix={json.dumps(expanded)}")
+
   build_manylinux:
-    needs: [pre_commit]
     name: ${{ matrix.policy }}_${{ matrix.platform }}
-    runs-on: ubuntu-22.04
+    needs: build_matrix
+    runs-on: ${{ matrix.runner }}
     permissions:
       actions: write # this permission is needed to delete cache
     strategy:
       fail-fast: false
       matrix:
-        policy: ["manylinux2014", "manylinux_2_28", "manylinux_2_34", "musllinux_1_2"]
-        platform: ["x86_64"]
-        include:
-          - policy: "manylinux2014"
-            platform: "i686"
-          - policy: "musllinux_1_2"
-            platform: "i686"
+        include: ${{ fromJson(needs.build_matrix.outputs.matrix) }}
     env:
       POLICY: ${{ matrix.policy }}
       PLATFORM: ${{ matrix.platform }}
@@ -65,12 +82,6 @@ jobs:
         with:
           fetch-depth: 50
 
-      - name: Set up emulation
-        if: matrix.platform != 'i686' && matrix.platform != 'x86_64'
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: ${{ matrix.platform }}
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 

diff --git a/.travis.yml b/.travis.yml
@@ -29,38 +29,18 @@ env:
 
 jobs:
    include:
-    - arch: arm64-graviton2
-      virt: vm
-      group: edge
-      env: POLICY="manylinux2014" PLATFORM="aarch64"
     - arch: s390x
       env: POLICY="manylinux2014" PLATFORM="s390x"
     - arch: ppc64le
       env: POLICY="manylinux2014" PLATFORM="ppc64le"
-    - arch: arm64-graviton2
-      virt: vm
-      group: edge
-      env: POLICY="manylinux_2_28" PLATFORM="aarch64"
     - arch: s390x
       env: POLICY="manylinux_2_28" PLATFORM="s390x"
     - arch: ppc64le
       env: POLICY="manylinux_2_28" PLATFORM="ppc64le"
-    - arch: arm64-graviton2
-      virt: vm
-      group: edge
-      env: POLICY="manylinux_2_34" PLATFORM="aarch64"
     - arch: s390x
       env: POLICY="manylinux_2_34" PLATFORM="s390x"
     - arch: ppc64le
       env: POLICY="manylinux_2_34" PLATFORM="ppc64le"
-    - arch: arm64-graviton2
-      virt: vm
-      group: edge
-      env: POLICY="musllinux_1_2" PLATFORM="aarch64"
-    - arch: arm64-graviton2
-      virt: vm
-      group: edge
-      env: POLICY="musllinux_1_2" PLATFORM="armv7l"
     - arch: s390x
       env: POLICY="musllinux_1_2" PLATFORM="s390x"
     - arch: ppc64le

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -78,16 +78,16 @@ RUN export CURL_ROOT=curl-8.11.1 && \
     export CURL_DOWNLOAD_URL=https://curl.haxx.se/download && \
     manylinux-entrypoint /build_scripts/build-curl.sh
 COPY build_scripts/build-git.sh /build_scripts/
-RUN export GIT_ROOT=git-2.47.1 && \
-    export GIT_HASH=f4c4e98667800585d218dfdf415eb72f73baa7abcac4569e2ce497970f8d6665 && \
+RUN export GIT_ROOT=git-2.48.1 && \
+    export GIT_HASH=51b4d03b1e311ba673591210f94f24a4c5781453e1eb188822e3d9cdc04c2212 && \
     export GIT_DOWNLOAD_URL=https://www.kernel.org/pub/software/scm/git && \
     manylinux-entrypoint /build_scripts/build-git.sh
 
 FROM build_base AS build_sqlite3
 COPY build_scripts/build-sqlite3.sh /build_scripts/
-RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3470200 && \
-    export SQLITE_AUTOCONF_HASH=f1b2ee412c28d7472bc95ba996368d6f0cdcf00362affdadb27ed286c179540b && \
-    export SQLITE_AUTOCONF_DOWNLOAD_URL=https://www.sqlite.org/2024 && \
+RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3480000 && \
+    export SQLITE_AUTOCONF_HASH=ac992f7fca3989de7ed1fe99c16363f848794c8c32a158dafd4eb927a2e02fd5 && \
+    export SQLITE_AUTOCONF_DOWNLOAD_URL=https://www.sqlite.org/2025 && \
     manylinux-entrypoint /build_scripts/build-sqlite3.sh
 
 FROM build_base AS build_tcl_tk

diff --git a/docker/build_scripts/requirements-tools/cmake b/docker/build_scripts/requirements-tools/cmake
@@ -1,23 +1,23 @@
 # This file was autogenerated by uv via the following command:
 #    nox -s update_python_dependencies
-cmake==3.31.2 \
-    --hash=sha256:09b3b1c919c76d25272bd9a0f15baf954d6c883abffdd1cfb3fbf1afa7a2c556 \
-    --hash=sha256:16a323fcbb86cf8a10aea82cd4deecb33edb3ed7e8907be8a06933ce04f6e6d1 \
-    --hash=sha256:2988aac62b9ada74bb802a8065ea58abe57bf203c057bb7e0456c3575a89c48a \
-    --hash=sha256:31aaa73c6bf49109b2a7ab86b3e6887b5db0da6be30ddfb30bed160b84787f89 \
-    --hash=sha256:378036396394dad7673cdfc603bb85af34945607df43e8dad731f5907c755f3b \
-    --hash=sha256:3bd054996b8a36ff5beb3cdd0ffbf8edf23d719cf946762662a9fb70525b1d1b \
-    --hash=sha256:604c44684dbcbec1458310bd57b9e69b7768ddd7cd2fc852607ca24616f34518 \
-    --hash=sha256:79b7eb78aea04e363a736e544afc4b4489f50415075bd77131e5314778b8e879 \
-    --hash=sha256:7b5f4f5ec4b0d6275369881a2a7bf7230af1cb60afdb20a7b2fbc70690f13564 \
-    --hash=sha256:8210a40d5b08bec7c752974f2b217a062a092480e33dcbd39d46a8cd96c29ddc \
-    --hash=sha256:82ec0a96b965874dc793ed6d3aa7edad6f364d4ba8b86307548bfbbca70fd2dd \
-    --hash=sha256:8c1fa50cafe54f9aa074d03cda1ade54271039d939194adc9cd1ac388b1af055 \
-    --hash=sha256:8d8c840502f84a16562820ee23f963583953939de63a9582f0f7735868cd18e6 \
-    --hash=sha256:994e14f485329d58d316487bd1759ad89717b895079e8b892a8220f03c1c5267 \
-    --hash=sha256:aec014f19536f2b6b0a94f4e20990c28fb93c4bdf9193d57fa5e50ef829aaf78 \
-    --hash=sha256:c8f9d7f8371a6739bbec7c238d213877f31b22a10930c91dea59b8b9463b6ee1 \
-    --hash=sha256:cedb6de320a65ff0137e5c6090b9b7fba459788237d3d4deb6e66be19fe9b61d \
-    --hash=sha256:e8fc23d376b3fae8945067f397d8503fff210eefe1e49ab9ece1d99a88679cf4 \
-    --hash=sha256:fa3b23b8bd52c0ae9e3c6b635ac8ee70d8f35d24bacf39cc4cea22aec6e4ed84
+cmake==3.31.4 \
+    --hash=sha256:20be7cdb41903edf85e8a498c4beff8d6854acbb087abfb07c362c738bdf0018 \
+    --hash=sha256:225d9a643b0b60ffce0399ff0cabd7a4820e0dbcb794e97d3aacfcf7c0589ae6 \
+    --hash=sha256:23781e17563693a68b0cef85749746894b8a61488e56e96fc6649b73652e8236 \
+    --hash=sha256:25c5094394f0cee21130b5678e5b4552f72470e266df6d6fb1d5c505100f0eaa \
+    --hash=sha256:2a37be93534df04513f0845492d71bc80899c3f87b77e3b01c95aff1a7fc9bde \
+    --hash=sha256:466c9295af440bb4a47cc5e1af10576cf2227620528afd0fd0b3effa1d513b49 \
+    --hash=sha256:838a388b559137f3654d8cf30f62bbdec10f8d1c3624f0d289614d33cdf4fba1 \
+    --hash=sha256:89143a5e2a5916061f2cfc5012e9fe6281aaf7c0dae7930bdc68d105d22ddc39 \
+    --hash=sha256:926d91cae2ba7d2f3df857d0fc066bdac4f3904bf5c95e99b60435e85aabedb4 \
+    --hash=sha256:929a8d8d289d69e43784661748ddd08933ce1ec5db8f9bcfce6ee817a48f8787 \
+    --hash=sha256:9479a9255197c49e135df039d8484c69aa63158a06ae9c2d0eb939da2f0f7dff \
+    --hash=sha256:a6a3b0b9557f41c955a6b25c94205f2ca9c3a46edca809ad87507c5ef6bc4274 \
+    --hash=sha256:a6ac2242e0b16ad7d94c9f8572d6f232e6169747be50e5cdf497f206c4819ce1 \
+    --hash=sha256:b463efdf5b92f3b290235aa9f8da092b3dac19b7636c563fd156022dab580649 \
+    --hash=sha256:c9f5f8289c5e7bd2ed654cbac164021fa7723064fee0443a2f0068bc08413d81 \
+    --hash=sha256:d378c9e58eac906bddafd673c7571262dcd5a9946bb1e8f9e3902572a8fa95ca \
+    --hash=sha256:f6af3b83a1b1fc1d990d18b6a566ee9c95c0393f986c6df15f2505dda8ad1bcc \
+    --hash=sha256:f96127bf663168accd29d5a50ee68ea80f26bcd37f96c7a14ef2378781f19936 \
+    --hash=sha256:fc048b4b70facd16699a43c737f6782b4eff56e8e6093090db5979532d9db0f6
     # via -r .nox/update_python_dependencies/tmp/cmake.in
diff --git a/docker/build_scripts/requirements-tools/uv b/docker/build_scripts/requirements-tools/uv
@@ -1,21 +1,21 @@
 # This file was autogenerated by uv via the following command:
 #    nox -s update_python_dependencies
-uv==0.5.16 \
-    --hash=sha256:2cf976b5d29f67bd8e5aa0c9b9c481c7df1580839ac107cbf58811c894a7e6a6 \
-    --hash=sha256:2e6f4fbd1cef0227e15374ab56a59ffcbd10c66f263b4e22ac43ca37061539d1 \
-    --hash=sha256:3419888b178b82511faebd8d1ca9cb9f5920a7142406898d76878adaffe8dfb1 \
-    --hash=sha256:598a0fa168ffe2786e11bfe0103fe22c06e90fe193ced172b843daf9abb42212 \
-    --hash=sha256:8fb0b26b9885d57609724fd4efb65785e6896b9bd4ecb865480962999d4247d4 \
-    --hash=sha256:9522aad257223c9470bb93b78f08dc473acf73a4a1403b999b2f1871a06343a6 \
-    --hash=sha256:9e73ae821678e7395635be0fec810f242e42f47b5f9cb82a7fc3d279bc37edb5 \
-    --hash=sha256:a7508b271a461603a38095eaca27b1766bd71f0a02232868a8faae0d8e8a1ae3 \
-    --hash=sha256:ba5f364809a46e590368a3f85638b71118952f30c79125f87144d9f00be0c9cb \
-    --hash=sha256:c609bb564f4d5822acd25d8881d76123c2e9aa26b634a6444b56142daff851b8 \
-    --hash=sha256:c6d3b45d66adedebe5c56602970b2c0fdf6d1977f53464691d428f1a7daa911b \
-    --hash=sha256:c7ee83877f4e324df4a61e7c79a476d26725e415894a755ce45de87709fc9581 \
-    --hash=sha256:c8310f40b8834812ddfb195fd62aafaed44b2993c71de8fa75ca0960c739d04e \
-    --hash=sha256:d540bbc1831d4187a29a9e8f7219e2093c491a45bcbcf2a6196f81c6d2162691 \
-    --hash=sha256:d54777d6c87a12213a59d2109289e4e35374cc79f88e29617ff764189b8b9cad \
-    --hash=sha256:e49b2c242cbc201665670dcc3ffa509fa6e131ebcf0423c59df91f2f21eca9d7 \
-    --hash=sha256:e764721c425ca6cde184ae69517748e47c4ea7f0d9c7dafa78721feeabc58e01
+uv==0.5.20 \
+    --hash=sha256:0c73540d6afb923ea64a5a54ddd34fec191f91c4b1071bf65a2ea7b05a854017 \
+    --hash=sha256:180b03d8fe0712297235498944252af19265aab396d22aef3783e963cfbfbcaf \
+    --hash=sha256:2f84a5df76bdb31fa76a4b85bcdb86fae9a4418ad9067d2909c58917663fb743 \
+    --hash=sha256:3010eb9611f89f4d6fa681c406269c59c0faf3446bb9ef01abcfb7da600a88e7 \
+    --hash=sha256:32d8685d262fca595a027ceca584549b0fe87b89be114e500f5af1de0fad2f1d \
+    --hash=sha256:4c23cde62f48b19a0dc6922f5c144b02c0c21b1c2e2606be872fc656e95a25e1 \
+    --hash=sha256:5af0ae866b0a9f2d7e8c0220401c585de69f5ebc157a582e8cb1014b16da1ef7 \
+    --hash=sha256:6c337f7e029dc8faf020dd76847ea084591ea96fd5f40ddb5117214ecb12a9e6 \
+    --hash=sha256:880bc5afdfaaf5329318d897bec9cd860d00c2b2f2ab8979c438862a0c2ed81b \
+    --hash=sha256:896305cc0d1f5fc5db97ed8e028c2fe236f6e0900bc72469d61ad97bc7ec5124 \
+    --hash=sha256:a4049cb7de46bd36d3b770ae3203e36d1db406ddc048bcd509578fd1d1072a38 \
+    --hash=sha256:ae9a69696e75d4b8d08dadda84b3e1b914167b2a19cd4c7c746f8c2c2c5ab55a \
+    --hash=sha256:b1541a67de42e64d9ff594b9a21ec238681ff0e40b2f90c1ecabcac71c7e622c \
+    --hash=sha256:bbdc9f82cdcb539549654c85aada1c583fe18235666316599648657ff497f266 \
+    --hash=sha256:c299d2c7aa04803c16ed5378e4b5dbfcc57eb6a40962f1141520eb43c0ecd291 \
+    --hash=sha256:e3b38c2d5c14847fb68cf7c88bfee3e09dd170e1b229441cee40c98ce5f56c5e \
+    --hash=sha256:ffce28f4b460f88f6e30d2a42874ee4d0e0daafe3d0436cda91ed05b130d7c90
     # via -r .nox/update_python_dependencies/tmp/uv.in