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

[Bot] Update dependencies
pypa · Jan 19, 2025 · 787e282 · 787e282
2 parents 73a50b5 + e153b0c
commit 787e282
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 30 deletions.
diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml
@@ -32,8 +32,8 @@ jobs:
       id: generate-token
       if: github.ref == 'refs/heads/main' && github.repository == 'pypa/manylinux'
       with:
-        app_id: ${{ secrets.MANYLINUX_BOT_APP_ID }}
-        private_key: ${{ secrets.MANYLINUX_BOT_APP_PRIVATE_KEY }}
+        app-id: ${{ secrets.MANYLINUX_BOT_APP_ID }}
+        private-key: ${{ secrets.MANYLINUX_BOT_APP_PRIVATE_KEY }}
     - name: "Run update native dependencies"
       run: nox -s update_native_dependencies
       env:

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -61,9 +61,9 @@ RUN export LIBTOOL_ROOT=libtool-2.5.3 && \
     manylinux-entrypoint /build_scripts/install-libtool.sh
 
 COPY build_scripts/install-libxcrypt.sh /build_scripts/
-RUN export LIBXCRYPT_VERSION=4.4.37 && \
-    export LIBXCRYPT_HASH=e02e1150f43de89c65f331f50b3c008fe47967bbbf62e7171c7a335583a4bd74 && \
-    export LIBXCRYPT_DOWNLOAD_URL=https://github.com/besser82/libxcrypt/archive && \
+RUN export LIBXCRYPT_VERSION=4.4.38 && \
+    export LIBXCRYPT_HASH=80304b9c306ea799327f01d9a7549bdb28317789182631f1b54f4511b4206dd6 && \
+    export LIBXCRYPT_DOWNLOAD_URL=https://github.com/besser82/libxcrypt/releases/download && \
     manylinux-entrypoint /build_scripts/install-libxcrypt.sh
 
 FROM runtime_base AS build_base

diff --git a/docker/build_scripts/install-libxcrypt.sh b/docker/build_scripts/install-libxcrypt.sh
@@ -20,11 +20,12 @@ fi
 check_var "${LIBXCRYPT_VERSION}"
 check_var "${LIBXCRYPT_HASH}"
 check_var "${LIBXCRYPT_DOWNLOAD_URL}"
-fetch_source "v${LIBXCRYPT_VERSION}.tar.gz" "${LIBXCRYPT_DOWNLOAD_URL}"
-check_sha256sum "v${LIBXCRYPT_VERSION}.tar.gz" "${LIBXCRYPT_HASH}"
-tar xfz "v${LIBXCRYPT_VERSION}.tar.gz"
-pushd "libxcrypt-${LIBXCRYPT_VERSION}"
-./autogen.sh > /dev/null
+LIBXCRYPT_ROOT="libxcrypt-${LIBXCRYPT_VERSION}"
+
+fetch_source "${LIBXCRYPT_ROOT}.tar.xz" "${LIBXCRYPT_DOWNLOAD_URL}/v${LIBXCRYPT_VERSION}"
+check_sha256sum "${LIBXCRYPT_ROOT}.tar.xz" "${LIBXCRYPT_HASH}"
+tar xfJ "${LIBXCRYPT_ROOT}.tar.xz"
+pushd "${LIBXCRYPT_ROOT}"
 DESTDIR=/manylinux-rootfs do_standard_install \
 	--disable-obsolete-api \
 	--enable-hashes=all \
@@ -41,7 +42,7 @@ DESTDIR=/manylinux-rootfs/so.1 do_standard_install \
 cp -P /manylinux-rootfs/so.1/usr/local/lib/libcrypt.so.1* /manylinux-rootfs/usr/local/lib/
 rm -rf /manylinux-rootfs/so.1
 popd
-rm -rf "v${LIBXCRYPT_VERSION}.tar.gz" "libxcrypt-${LIBXCRYPT_VERSION}"
+rm -rf "${LIBXCRYPT_ROOT}.tar.xz" "${LIBXCRYPT_ROOT}"
 
 # Strip what we can
 strip_ /manylinux-rootfs

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.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
+uv==0.5.21 \
+    --hash=sha256:10232d5f24a1831f7ab3967f0b56f78681c520ff3391dcf5096eface94619e8e \
+    --hash=sha256:168fca3bad68f75518a168feeebfd2c0b104e9abc06a33caa710d0b2753db3aa \
+    --hash=sha256:2a1582f4964b1249b0e82ad0e60519a73392e099541a6db587e7333139255d50 \
+    --hash=sha256:34944204a39b840fa0efb2ba27f4decce50115460c6b8e4e6ade6aae6246d0cf \
+    --hash=sha256:36f21534a9e00a85cc532ef9575d3785a4e434a25daa93e51ebc08b54ade4991 \
+    --hash=sha256:4ecdf58adf9376f2b4f63e6538e38be0e77fcd3d5b07b3ee56a3c7cd1d9ca526 \
+    --hash=sha256:609299c04c00ece874b30abee9cb83753224a03e8d9191327397f33a92674a53 \
+    --hash=sha256:6e97c68306c0583af1b14b5b801c3e18ab7bc349a4c9cdd8ab5f8f46348539c5 \
+    --hash=sha256:73c9d1bdbff989114c5c37649235c569f89b65bd2e57b75d8fdb73946ade7cbd \
+    --hash=sha256:8ea7309dc1891e88276e207aa389cc4524ec7a7038a75bfd7c5a09ed3701316f \
+    --hash=sha256:afd98237d97b92935c8d5a9bf28218b5ecb497af9a99ad0a740d0b71b51f864a \
+    --hash=sha256:b317bfb7ba61e0396be5776f723e03e818a6393322f62828b67c16b565e1c0ec \
+    --hash=sha256:dafa7b5bb3ae8949ba100645b7a8d804f683547586024f73ad1b2d97a1aa9976 \
+    --hash=sha256:eb33043b42111ae3fef76906422b5c4247188e1ae1233da63be82cc64bb527d0 \
+    --hash=sha256:ef4e579390a022efcbfe8720f51ad46fdff54caf982782967d5689841485ddd8 \
+    --hash=sha256:f17d35ab4a099657ad55d3cfeaf91a35b929ae2cd2b22163710cdfec45ea3941 \
+    --hash=sha256:f5ba5076b6b69161d318f5ddeff6dd935ab29a157ff10dd8756ed6dcb5d0a497
     # via -r .nox/update_python_dependencies/tmp/uv.in
diff --git a/tools/update_native_dependencies.py b/tools/update_native_dependencies.py
@@ -158,7 +158,7 @@ def _update_with_gh(tool, dry_run):
             url = re.match(
                 f"^    export {tool.upper()}_DOWNLOAD_URL=(?P<url>\\S+) && \\\\$", lines[i + 2]
             )["url"]
-            sha256 = _sha256(f"{url}/{latest_tag}.tar.gz")
+            sha256 = _sha256(f"{url}/{latest_tag}/libxcrypt-{latest_version}.tar.xz")
             lines[i + 0] = f"RUN export {tool.upper()}_VERSION={latest_version} && \\"
             lines[i + 1] = f"    export {tool.upper()}_HASH={sha256} && \\"
             message = f"Bump {tool} {current_version} → {latest_version}"