diff --git a/cgmanifests/cgmanifest.json b/cgmanifests/cgmanifest.json index d95bfbb65e5b7..26389a387f273 100644 --- a/cgmanifests/cgmanifest.json +++ b/cgmanifests/cgmanifest.json @@ -428,7 +428,7 @@ "component": { "type": "git", "git": { - "commitHash": "56195b3a67d988fa9c6eafdc459d92f0909f4782", + "commitHash": "72ab18b4f3d83469c4e497cdb5a3877044808930", "repositoryUrl": "https://github.com/pypa/manylinux" }, "comments": "For building our CI build docker image" @@ -448,30 +448,30 @@ "component": { "type": "git", "git": { - "commitHash": "1e5d33e9b9b8631b36f061103a30208b206fd03a", + "commitHash": "f2f3f537829ab0ef6948be5ee7f46b8ce8213ff2", "repositoryUrl": "https://github.com/python/cpython" }, - "comments": "Python 3.9.1" + "comments": "Python 3.9.10" } }, { "component": { "type": "git", "git": { - "commitHash": "6503f05dd59e26a9986bdea097b3da9b3546f45b", + "commitHash": "07119dd38c9a6e5da84ca8a0a46acdf8a3e60ecf", "repositoryUrl": "https://github.com/python/cpython" }, - "comments": "Python 3.8.7" + "comments": "Python 3.8.12" } }, { "component": { "type": "git", "git": { - "commitHash": "13c94747c74437e594b7fc242ff7da668e81887c", + "commitHash": "1f97973f630fda109039b2a8c8024a70eb92932f", "repositoryUrl": "https://github.com/python/cpython" }, - "comments": "Python 3.7.9" + "comments": "Python 3.7.12" } }, { diff --git a/cgmanifests/generated/cgmanifest.json b/cgmanifests/generated/cgmanifest.json index b10e0be0e67a7..34f43b580b393 100644 --- a/cgmanifests/generated/cgmanifest.json +++ b/cgmanifests/generated/cgmanifest.json @@ -34,24 +34,13 @@ "comments": "manylinux dependency" } }, - { - "Component": { - "Type": "other", - "other": { - "Name": "patchelf", - "Version": "0.13", - "DownloadUrl": "https://github.com/NixOS/patchelf/archive/0.13.tar.gz" - }, - "comments": "manylinux dependency" - } - }, { "Component": { "Type": "other", "other": { "Name": "libxcrypt", - "Version": "4.4.26", - "DownloadUrl": "https://github.com/besser82/libxcrypt/archive/v4.4.26.tar.gz" + "Version": "4.4.27", + "DownloadUrl": "https://github.com/besser82/libxcrypt/archive/v4.4.27.tar.gz" }, "comments": "manylinux dependency" } @@ -61,8 +50,8 @@ "Type": "other", "other": { "Name": "git", - "Version": "2.33.1", - "DownloadUrl": "https://www.kernel.org/pub/software/scm/git/git-2.33.1.tar.gz" + "Version": "2.34.1", + "DownloadUrl": "https://www.kernel.org/pub/software/scm/git/git-2.34.1.tar.gz" }, "comments": "manylinux dependency" } @@ -83,8 +72,8 @@ "Type": "other", "other": { "Name": "sqlite_autoconf", - "Version": "3360000", - "DownloadUrl": "https://www.sqlite.org/2021/sqlite-autoconf-3360000.tar.gz" + "Version": "3370200", + "DownloadUrl": "https://www.sqlite.org/2022/sqlite-autoconf-3370200.tar.gz" }, "comments": "manylinux dependency" } @@ -94,8 +83,8 @@ "Type": "other", "other": { "Name": "openssl", - "Version": "1.1.1l", - "DownloadUrl": "https://www.openssl.org/source/openssl-1.1.1l.tar.gz" + "Version": "1.1.1m", + "DownloadUrl": "https://www.openssl.org/source/openssl-1.1.1m.tar.gz" }, "comments": "manylinux dependency" } diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_cuda11 b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_cuda11 index dc35bf3048ba9..813820a862dad 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_cuda11 +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_cuda11 @@ -65,15 +65,9 @@ RUN export LIBTOOL_ROOT=libtool-2.4.6 && \ export LIBTOOL_DOWNLOAD_URL=http://ftp.gnu.org/gnu/libtool && \ manylinux-entrypoint /build_scripts/install-libtool.sh -COPY build_scripts/install-patchelf.sh /build_scripts/ -RUN export PATCHELF_VERSION=0.13 && \ - export PATCHELF_HASH=60c6aeadb673de9cc1838b630c81f61e31c501de324ef7f1e8094a2431197d09 && \ - export PATCHELF_DOWNLOAD_URL=https://github.com/NixOS/patchelf/archive && \ - manylinux-entrypoint /build_scripts/install-patchelf.sh - COPY build_scripts/install-libxcrypt.sh /build_scripts/ -RUN export LIBXCRYPT_VERSION=4.4.26 && \ - export LIBXCRYPT_HASH=e8a544dd19171c1e6191a6044c96cc31496d781ba08b5a00f53310d001d58114 && \ +RUN export LIBXCRYPT_VERSION=4.4.27 && \ + export LIBXCRYPT_HASH=e4ff47b7fa5370fa08e27258f8a0de5cb7e9b09c297ec7ab56a8a82e229a1c84 && \ export LIBXCRYPT_DOWNLOAD_URL=https://github.com/besser82/libxcrypt/archive && \ export PERL_ROOT=perl-5.34.0 && \ export PERL_HASH=551efc818b968b05216024fb0b727ef2ad4c100f8cb6b43fab615fa78ae5be9a && \ @@ -87,8 +81,8 @@ RUN manylinux-entrypoint /build_scripts/install-build-packages.sh FROM build_base AS build_git COPY build_scripts/build-git.sh /build_scripts/ -RUN export GIT_ROOT=git-2.33.1 && \ - export GIT_HASH=02047f8dc8934d57ff5e02aadd8a2fe8e0bcf94a7158da375e48086cc46fce1d && \ +RUN export GIT_ROOT=git-2.34.1 && \ + export GIT_HASH=fc4eb5ecb9299db91cdd156c06cdeb41833f53adc5631ddf8c0cb13eaa2911c1 && \ export GIT_DOWNLOAD_URL=https://www.kernel.org/pub/software/scm/git && \ manylinux-entrypoint /build_scripts/build-git.sh @@ -106,14 +100,14 @@ RUN export SWIG_ROOT=swig-4.0.2 && \ FROM build_base AS build_cpython COPY build_scripts/build-sqlite3.sh /build_scripts/ -RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3360000 && \ - export SQLITE_AUTOCONF_HASH=bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3 && \ - export SQLITE_AUTOCONF_DOWNLOAD_URL=https://www.sqlite.org/2021 && \ +RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3370200 && \ + export SQLITE_AUTOCONF_HASH=4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8 && \ + export SQLITE_AUTOCONF_DOWNLOAD_URL=https://www.sqlite.org/2022 && \ manylinux-entrypoint /build_scripts/build-sqlite3.sh COPY build_scripts/build-openssl.sh /build_scripts/ -RUN export OPENSSL_ROOT=openssl-1.1.1l && \ - export OPENSSL_HASH=0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 && \ +RUN export OPENSSL_ROOT=openssl-1.1.1m && \ + export OPENSSL_HASH=f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 && \ export OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source && \ manylinux-entrypoint /build_scripts/build-openssl.sh @@ -137,17 +131,19 @@ RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.8.12 FROM build_cpython AS build_cpython39 COPY build_scripts/ambv-pubkey.txt /build_scripts/cpython-pubkeys.txt -RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.9.8 +RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.9.10 FROM build_cpython AS build_cpython310 COPY build_scripts/cpython-pubkey-310-311.txt /build_scripts/cpython-pubkeys.txt -RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.10.0 +RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.10.2 FROM build_cpython AS all_python -COPY build_scripts/install-pypy.sh /build_scripts/install-pypy.sh -COPY build_scripts/pypy.sha256 /build_scripts/pypy.sha256 +COPY build_scripts/install-pypy.sh \ + build_scripts/pypy.sha256 \ + build_scripts/finalize-python.sh \ + /build_scripts/ RUN manylinux-entrypoint /build_scripts/install-pypy.sh 3.7 7.3.7 RUN manylinux-entrypoint /build_scripts/install-pypy.sh 3.8 7.3.7 COPY --from=build_cpython36 /opt/_internal /opt/_internal/ @@ -155,7 +151,7 @@ COPY --from=build_cpython37 /opt/_internal /opt/_internal/ COPY --from=build_cpython38 /opt/_internal /opt/_internal/ COPY --from=build_cpython39 /opt/_internal /opt/_internal/ COPY --from=build_cpython310 /opt/_internal /opt/_internal/ -RUN hardlink -cv /opt/_internal +RUN manylinux-entrypoint /build_scripts/finalize-python.sh FROM runtime_base diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_cuda11_1_tensorrt7_2 b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_cuda11_1_tensorrt7_2 index 053701aab3ca5..b5b89a558fe2c 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_cuda11_1_tensorrt7_2 +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_cuda11_1_tensorrt7_2 @@ -65,15 +65,9 @@ RUN export LIBTOOL_ROOT=libtool-2.4.6 && \ export LIBTOOL_DOWNLOAD_URL=http://ftp.gnu.org/gnu/libtool && \ manylinux-entrypoint /build_scripts/install-libtool.sh -COPY build_scripts/install-patchelf.sh /build_scripts/ -RUN export PATCHELF_VERSION=0.13 && \ - export PATCHELF_HASH=60c6aeadb673de9cc1838b630c81f61e31c501de324ef7f1e8094a2431197d09 && \ - export PATCHELF_DOWNLOAD_URL=https://github.com/NixOS/patchelf/archive && \ - manylinux-entrypoint /build_scripts/install-patchelf.sh - COPY build_scripts/install-libxcrypt.sh /build_scripts/ -RUN export LIBXCRYPT_VERSION=4.4.26 && \ - export LIBXCRYPT_HASH=e8a544dd19171c1e6191a6044c96cc31496d781ba08b5a00f53310d001d58114 && \ +RUN export LIBXCRYPT_VERSION=4.4.27 && \ + export LIBXCRYPT_HASH=e4ff47b7fa5370fa08e27258f8a0de5cb7e9b09c297ec7ab56a8a82e229a1c84 && \ export LIBXCRYPT_DOWNLOAD_URL=https://github.com/besser82/libxcrypt/archive && \ export PERL_ROOT=perl-5.34.0 && \ export PERL_HASH=551efc818b968b05216024fb0b727ef2ad4c100f8cb6b43fab615fa78ae5be9a && \ @@ -87,8 +81,8 @@ RUN manylinux-entrypoint /build_scripts/install-build-packages.sh FROM build_base AS build_git COPY build_scripts/build-git.sh /build_scripts/ -RUN export GIT_ROOT=git-2.33.1 && \ - export GIT_HASH=02047f8dc8934d57ff5e02aadd8a2fe8e0bcf94a7158da375e48086cc46fce1d && \ +RUN export GIT_ROOT=git-2.34.1 && \ + export GIT_HASH=fc4eb5ecb9299db91cdd156c06cdeb41833f53adc5631ddf8c0cb13eaa2911c1 && \ export GIT_DOWNLOAD_URL=https://www.kernel.org/pub/software/scm/git && \ manylinux-entrypoint /build_scripts/build-git.sh @@ -106,14 +100,14 @@ RUN export SWIG_ROOT=swig-4.0.2 && \ FROM build_base AS build_cpython COPY build_scripts/build-sqlite3.sh /build_scripts/ -RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3360000 && \ - export SQLITE_AUTOCONF_HASH=bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3 && \ - export SQLITE_AUTOCONF_DOWNLOAD_URL=https://www.sqlite.org/2021 && \ +RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3370200 && \ + export SQLITE_AUTOCONF_HASH=4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8 && \ + export SQLITE_AUTOCONF_DOWNLOAD_URL=https://www.sqlite.org/2022 && \ manylinux-entrypoint /build_scripts/build-sqlite3.sh COPY build_scripts/build-openssl.sh /build_scripts/ -RUN export OPENSSL_ROOT=openssl-1.1.1l && \ - export OPENSSL_HASH=0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 && \ +RUN export OPENSSL_ROOT=openssl-1.1.1m && \ + export OPENSSL_HASH=f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 && \ export OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source && \ manylinux-entrypoint /build_scripts/build-openssl.sh @@ -137,17 +131,19 @@ RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.8.12 FROM build_cpython AS build_cpython39 COPY build_scripts/ambv-pubkey.txt /build_scripts/cpython-pubkeys.txt -RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.9.8 +RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.9.10 FROM build_cpython AS build_cpython310 COPY build_scripts/cpython-pubkey-310-311.txt /build_scripts/cpython-pubkeys.txt -RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.10.0 +RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.10.2 FROM build_cpython AS all_python -COPY build_scripts/install-pypy.sh /build_scripts/install-pypy.sh -COPY build_scripts/pypy.sha256 /build_scripts/pypy.sha256 +COPY build_scripts/install-pypy.sh \ + build_scripts/pypy.sha256 \ + build_scripts/finalize-python.sh \ + /build_scripts/ RUN manylinux-entrypoint /build_scripts/install-pypy.sh 3.7 7.3.7 RUN manylinux-entrypoint /build_scripts/install-pypy.sh 3.8 7.3.7 COPY --from=build_cpython36 /opt/_internal /opt/_internal/ @@ -155,7 +151,7 @@ COPY --from=build_cpython37 /opt/_internal /opt/_internal/ COPY --from=build_cpython38 /opt/_internal /opt/_internal/ COPY --from=build_cpython39 /opt/_internal /opt/_internal/ COPY --from=build_cpython310 /opt/_internal /opt/_internal/ -RUN hardlink -cv /opt/_internal +RUN manylinux-entrypoint /build_scripts/finalize-python.sh FROM runtime_base diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_cuda11_4_tensorrt8_0 b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_cuda11_4_tensorrt8_0 index d8e3c69b9d739..8b25d3021937f 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_cuda11_4_tensorrt8_0 +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_cuda11_4_tensorrt8_0 @@ -65,15 +65,9 @@ RUN export LIBTOOL_ROOT=libtool-2.4.6 && \ export LIBTOOL_DOWNLOAD_URL=http://ftp.gnu.org/gnu/libtool && \ manylinux-entrypoint /build_scripts/install-libtool.sh -COPY build_scripts/install-patchelf.sh /build_scripts/ -RUN export PATCHELF_VERSION=0.13 && \ - export PATCHELF_HASH=60c6aeadb673de9cc1838b630c81f61e31c501de324ef7f1e8094a2431197d09 && \ - export PATCHELF_DOWNLOAD_URL=https://github.com/NixOS/patchelf/archive && \ - manylinux-entrypoint /build_scripts/install-patchelf.sh - COPY build_scripts/install-libxcrypt.sh /build_scripts/ -RUN export LIBXCRYPT_VERSION=4.4.26 && \ - export LIBXCRYPT_HASH=e8a544dd19171c1e6191a6044c96cc31496d781ba08b5a00f53310d001d58114 && \ +RUN export LIBXCRYPT_VERSION=4.4.27 && \ + export LIBXCRYPT_HASH=e4ff47b7fa5370fa08e27258f8a0de5cb7e9b09c297ec7ab56a8a82e229a1c84 && \ export LIBXCRYPT_DOWNLOAD_URL=https://github.com/besser82/libxcrypt/archive && \ export PERL_ROOT=perl-5.34.0 && \ export PERL_HASH=551efc818b968b05216024fb0b727ef2ad4c100f8cb6b43fab615fa78ae5be9a && \ @@ -87,8 +81,8 @@ RUN manylinux-entrypoint /build_scripts/install-build-packages.sh FROM build_base AS build_git COPY build_scripts/build-git.sh /build_scripts/ -RUN export GIT_ROOT=git-2.33.1 && \ - export GIT_HASH=02047f8dc8934d57ff5e02aadd8a2fe8e0bcf94a7158da375e48086cc46fce1d && \ +RUN export GIT_ROOT=git-2.34.1 && \ + export GIT_HASH=fc4eb5ecb9299db91cdd156c06cdeb41833f53adc5631ddf8c0cb13eaa2911c1 && \ export GIT_DOWNLOAD_URL=https://www.kernel.org/pub/software/scm/git && \ manylinux-entrypoint /build_scripts/build-git.sh @@ -106,14 +100,14 @@ RUN export SWIG_ROOT=swig-4.0.2 && \ FROM build_base AS build_cpython COPY build_scripts/build-sqlite3.sh /build_scripts/ -RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3360000 && \ - export SQLITE_AUTOCONF_HASH=bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3 && \ - export SQLITE_AUTOCONF_DOWNLOAD_URL=https://www.sqlite.org/2021 && \ +RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3370200 && \ + export SQLITE_AUTOCONF_HASH=4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8 && \ + export SQLITE_AUTOCONF_DOWNLOAD_URL=https://www.sqlite.org/2022 && \ manylinux-entrypoint /build_scripts/build-sqlite3.sh COPY build_scripts/build-openssl.sh /build_scripts/ -RUN export OPENSSL_ROOT=openssl-1.1.1l && \ - export OPENSSL_HASH=0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 && \ +RUN export OPENSSL_ROOT=openssl-1.1.1m && \ + export OPENSSL_HASH=f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 && \ export OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source && \ manylinux-entrypoint /build_scripts/build-openssl.sh @@ -137,17 +131,19 @@ RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.8.12 FROM build_cpython AS build_cpython39 COPY build_scripts/ambv-pubkey.txt /build_scripts/cpython-pubkeys.txt -RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.9.8 +RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.9.10 FROM build_cpython AS build_cpython310 COPY build_scripts/cpython-pubkey-310-311.txt /build_scripts/cpython-pubkeys.txt -RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.10.0 +RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.10.2 FROM build_cpython AS all_python -COPY build_scripts/install-pypy.sh /build_scripts/install-pypy.sh -COPY build_scripts/pypy.sha256 /build_scripts/pypy.sha256 +COPY build_scripts/install-pypy.sh \ + build_scripts/pypy.sha256 \ + build_scripts/finalize-python.sh \ + /build_scripts/ RUN manylinux-entrypoint /build_scripts/install-pypy.sh 3.7 7.3.7 RUN manylinux-entrypoint /build_scripts/install-pypy.sh 3.8 7.3.7 COPY --from=build_cpython36 /opt/_internal /opt/_internal/ @@ -155,7 +151,7 @@ COPY --from=build_cpython37 /opt/_internal /opt/_internal/ COPY --from=build_cpython38 /opt/_internal /opt/_internal/ COPY --from=build_cpython39 /opt/_internal /opt/_internal/ COPY --from=build_cpython310 /opt/_internal /opt/_internal/ -RUN hardlink -cv /opt/_internal +RUN manylinux-entrypoint /build_scripts/finalize-python.sh FROM runtime_base diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_cuda11_4_tensorrt8_2 b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_cuda11_4_tensorrt8_2 index 3ac8adaea3661..1d24e70337238 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_cuda11_4_tensorrt8_2 +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_cuda11_4_tensorrt8_2 @@ -65,15 +65,9 @@ RUN export LIBTOOL_ROOT=libtool-2.4.6 && \ export LIBTOOL_DOWNLOAD_URL=http://ftp.gnu.org/gnu/libtool && \ manylinux-entrypoint /build_scripts/install-libtool.sh -COPY build_scripts/install-patchelf.sh /build_scripts/ -RUN export PATCHELF_VERSION=0.13 && \ - export PATCHELF_HASH=60c6aeadb673de9cc1838b630c81f61e31c501de324ef7f1e8094a2431197d09 && \ - export PATCHELF_DOWNLOAD_URL=https://github.com/NixOS/patchelf/archive && \ - manylinux-entrypoint /build_scripts/install-patchelf.sh - COPY build_scripts/install-libxcrypt.sh /build_scripts/ -RUN export LIBXCRYPT_VERSION=4.4.26 && \ - export LIBXCRYPT_HASH=e8a544dd19171c1e6191a6044c96cc31496d781ba08b5a00f53310d001d58114 && \ +RUN export LIBXCRYPT_VERSION=4.4.27 && \ + export LIBXCRYPT_HASH=e4ff47b7fa5370fa08e27258f8a0de5cb7e9b09c297ec7ab56a8a82e229a1c84 && \ export LIBXCRYPT_DOWNLOAD_URL=https://github.com/besser82/libxcrypt/archive && \ export PERL_ROOT=perl-5.34.0 && \ export PERL_HASH=551efc818b968b05216024fb0b727ef2ad4c100f8cb6b43fab615fa78ae5be9a && \ @@ -87,8 +81,8 @@ RUN manylinux-entrypoint /build_scripts/install-build-packages.sh FROM build_base AS build_git COPY build_scripts/build-git.sh /build_scripts/ -RUN export GIT_ROOT=git-2.33.1 && \ - export GIT_HASH=02047f8dc8934d57ff5e02aadd8a2fe8e0bcf94a7158da375e48086cc46fce1d && \ +RUN export GIT_ROOT=git-2.34.1 && \ + export GIT_HASH=fc4eb5ecb9299db91cdd156c06cdeb41833f53adc5631ddf8c0cb13eaa2911c1 && \ export GIT_DOWNLOAD_URL=https://www.kernel.org/pub/software/scm/git && \ manylinux-entrypoint /build_scripts/build-git.sh @@ -106,14 +100,14 @@ RUN export SWIG_ROOT=swig-4.0.2 && \ FROM build_base AS build_cpython COPY build_scripts/build-sqlite3.sh /build_scripts/ -RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3360000 && \ - export SQLITE_AUTOCONF_HASH=bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3 && \ - export SQLITE_AUTOCONF_DOWNLOAD_URL=https://www.sqlite.org/2021 && \ +RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3370200 && \ + export SQLITE_AUTOCONF_HASH=4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8 && \ + export SQLITE_AUTOCONF_DOWNLOAD_URL=https://www.sqlite.org/2022 && \ manylinux-entrypoint /build_scripts/build-sqlite3.sh COPY build_scripts/build-openssl.sh /build_scripts/ -RUN export OPENSSL_ROOT=openssl-1.1.1l && \ - export OPENSSL_HASH=0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 && \ +RUN export OPENSSL_ROOT=openssl-1.1.1m && \ + export OPENSSL_HASH=f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 && \ export OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source && \ manylinux-entrypoint /build_scripts/build-openssl.sh @@ -137,17 +131,19 @@ RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.8.12 FROM build_cpython AS build_cpython39 COPY build_scripts/ambv-pubkey.txt /build_scripts/cpython-pubkeys.txt -RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.9.8 +RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.9.10 FROM build_cpython AS build_cpython310 COPY build_scripts/cpython-pubkey-310-311.txt /build_scripts/cpython-pubkeys.txt -RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.10.0 +RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.10.2 FROM build_cpython AS all_python -COPY build_scripts/install-pypy.sh /build_scripts/install-pypy.sh -COPY build_scripts/pypy.sha256 /build_scripts/pypy.sha256 +COPY build_scripts/install-pypy.sh \ + build_scripts/pypy.sha256 \ + build_scripts/finalize-python.sh \ + /build_scripts/ RUN manylinux-entrypoint /build_scripts/install-pypy.sh 3.7 7.3.7 RUN manylinux-entrypoint /build_scripts/install-pypy.sh 3.8 7.3.7 COPY --from=build_cpython36 /opt/_internal /opt/_internal/ @@ -155,7 +151,7 @@ COPY --from=build_cpython37 /opt/_internal /opt/_internal/ COPY --from=build_cpython38 /opt/_internal /opt/_internal/ COPY --from=build_cpython39 /opt/_internal /opt/_internal/ COPY --from=build_cpython310 /opt/_internal /opt/_internal/ -RUN hardlink -cv /opt/_internal +RUN manylinux-entrypoint /build_scripts/finalize-python.sh FROM runtime_base diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_cuda11_tensorrt7_2 b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_cuda11_tensorrt7_2 index 64fd3daa594b5..664f2fcaac72e 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_cuda11_tensorrt7_2 +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_cuda11_tensorrt7_2 @@ -65,15 +65,9 @@ RUN export LIBTOOL_ROOT=libtool-2.4.6 && \ export LIBTOOL_DOWNLOAD_URL=http://ftp.gnu.org/gnu/libtool && \ manylinux-entrypoint /build_scripts/install-libtool.sh -COPY build_scripts/install-patchelf.sh /build_scripts/ -RUN export PATCHELF_VERSION=0.13 && \ - export PATCHELF_HASH=60c6aeadb673de9cc1838b630c81f61e31c501de324ef7f1e8094a2431197d09 && \ - export PATCHELF_DOWNLOAD_URL=https://github.com/NixOS/patchelf/archive && \ - manylinux-entrypoint /build_scripts/install-patchelf.sh - COPY build_scripts/install-libxcrypt.sh /build_scripts/ -RUN export LIBXCRYPT_VERSION=4.4.26 && \ - export LIBXCRYPT_HASH=e8a544dd19171c1e6191a6044c96cc31496d781ba08b5a00f53310d001d58114 && \ +RUN export LIBXCRYPT_VERSION=4.4.27 && \ + export LIBXCRYPT_HASH=e4ff47b7fa5370fa08e27258f8a0de5cb7e9b09c297ec7ab56a8a82e229a1c84 && \ export LIBXCRYPT_DOWNLOAD_URL=https://github.com/besser82/libxcrypt/archive && \ export PERL_ROOT=perl-5.34.0 && \ export PERL_HASH=551efc818b968b05216024fb0b727ef2ad4c100f8cb6b43fab615fa78ae5be9a && \ @@ -87,8 +81,8 @@ RUN manylinux-entrypoint /build_scripts/install-build-packages.sh FROM build_base AS build_git COPY build_scripts/build-git.sh /build_scripts/ -RUN export GIT_ROOT=git-2.33.1 && \ - export GIT_HASH=02047f8dc8934d57ff5e02aadd8a2fe8e0bcf94a7158da375e48086cc46fce1d && \ +RUN export GIT_ROOT=git-2.34.1 && \ + export GIT_HASH=fc4eb5ecb9299db91cdd156c06cdeb41833f53adc5631ddf8c0cb13eaa2911c1 && \ export GIT_DOWNLOAD_URL=https://www.kernel.org/pub/software/scm/git && \ manylinux-entrypoint /build_scripts/build-git.sh @@ -106,14 +100,14 @@ RUN export SWIG_ROOT=swig-4.0.2 && \ FROM build_base AS build_cpython COPY build_scripts/build-sqlite3.sh /build_scripts/ -RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3360000 && \ - export SQLITE_AUTOCONF_HASH=bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3 && \ - export SQLITE_AUTOCONF_DOWNLOAD_URL=https://www.sqlite.org/2021 && \ +RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3370200 && \ + export SQLITE_AUTOCONF_HASH=4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8 && \ + export SQLITE_AUTOCONF_DOWNLOAD_URL=https://www.sqlite.org/2022 && \ manylinux-entrypoint /build_scripts/build-sqlite3.sh COPY build_scripts/build-openssl.sh /build_scripts/ -RUN export OPENSSL_ROOT=openssl-1.1.1l && \ - export OPENSSL_HASH=0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 && \ +RUN export OPENSSL_ROOT=openssl-1.1.1m && \ + export OPENSSL_HASH=f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 && \ export OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source && \ manylinux-entrypoint /build_scripts/build-openssl.sh @@ -137,17 +131,19 @@ RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.8.12 FROM build_cpython AS build_cpython39 COPY build_scripts/ambv-pubkey.txt /build_scripts/cpython-pubkeys.txt -RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.9.8 +RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.9.10 FROM build_cpython AS build_cpython310 COPY build_scripts/cpython-pubkey-310-311.txt /build_scripts/cpython-pubkeys.txt -RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.10.0 +RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.10.2 FROM build_cpython AS all_python -COPY build_scripts/install-pypy.sh /build_scripts/install-pypy.sh -COPY build_scripts/pypy.sha256 /build_scripts/pypy.sha256 +COPY build_scripts/install-pypy.sh \ + build_scripts/pypy.sha256 \ + build_scripts/finalize-python.sh \ + /build_scripts/ RUN manylinux-entrypoint /build_scripts/install-pypy.sh 3.7 7.3.7 RUN manylinux-entrypoint /build_scripts/install-pypy.sh 3.8 7.3.7 COPY --from=build_cpython36 /opt/_internal /opt/_internal/ @@ -155,7 +151,7 @@ COPY --from=build_cpython37 /opt/_internal /opt/_internal/ COPY --from=build_cpython38 /opt/_internal /opt/_internal/ COPY --from=build_cpython39 /opt/_internal /opt/_internal/ COPY --from=build_cpython310 /opt/_internal /opt/_internal/ -RUN hardlink -cv /opt/_internal +RUN manylinux-entrypoint /build_scripts/finalize-python.sh FROM runtime_base diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_rocm4_2 b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_rocm4_2 index 2886bd349ebc3..87f20c376a0f3 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_rocm4_2 +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_rocm4_2 @@ -69,15 +69,9 @@ RUN export LIBTOOL_ROOT=libtool-2.4.6 && \ export LIBTOOL_DOWNLOAD_URL=http://ftp.gnu.org/gnu/libtool && \ manylinux-entrypoint /build_scripts/install-libtool.sh -COPY build_scripts/install-patchelf.sh /build_scripts/ -RUN export PATCHELF_VERSION=0.13 && \ - export PATCHELF_HASH=60c6aeadb673de9cc1838b630c81f61e31c501de324ef7f1e8094a2431197d09 && \ - export PATCHELF_DOWNLOAD_URL=https://github.com/NixOS/patchelf/archive && \ - manylinux-entrypoint /build_scripts/install-patchelf.sh - COPY build_scripts/install-libxcrypt.sh /build_scripts/ -RUN export LIBXCRYPT_VERSION=4.4.26 && \ - export LIBXCRYPT_HASH=e8a544dd19171c1e6191a6044c96cc31496d781ba08b5a00f53310d001d58114 && \ +RUN export LIBXCRYPT_VERSION=4.4.27 && \ + export LIBXCRYPT_HASH=e4ff47b7fa5370fa08e27258f8a0de5cb7e9b09c297ec7ab56a8a82e229a1c84 && \ export LIBXCRYPT_DOWNLOAD_URL=https://github.com/besser82/libxcrypt/archive && \ export PERL_ROOT=perl-5.34.0 && \ export PERL_HASH=551efc818b968b05216024fb0b727ef2ad4c100f8cb6b43fab615fa78ae5be9a && \ @@ -98,8 +92,8 @@ RUN manylinux-entrypoint /build_scripts/install-build-packages.sh FROM build_base AS build_git COPY build_scripts/build-git.sh /build_scripts/ -RUN export GIT_ROOT=git-2.33.1 && \ - export GIT_HASH=02047f8dc8934d57ff5e02aadd8a2fe8e0bcf94a7158da375e48086cc46fce1d && \ +RUN export GIT_ROOT=git-2.34.1 && \ + export GIT_HASH=fc4eb5ecb9299db91cdd156c06cdeb41833f53adc5631ddf8c0cb13eaa2911c1 && \ export GIT_DOWNLOAD_URL=https://www.kernel.org/pub/software/scm/git && \ manylinux-entrypoint /build_scripts/build-git.sh @@ -117,14 +111,14 @@ RUN export SWIG_ROOT=swig-4.0.2 && \ FROM build_base AS build_cpython COPY build_scripts/build-sqlite3.sh /build_scripts/ -RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3360000 && \ - export SQLITE_AUTOCONF_HASH=bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3 && \ - export SQLITE_AUTOCONF_DOWNLOAD_URL=https://www.sqlite.org/2021 && \ +RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3370200 && \ + export SQLITE_AUTOCONF_HASH=4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8 && \ + export SQLITE_AUTOCONF_DOWNLOAD_URL=https://www.sqlite.org/2022 && \ manylinux-entrypoint /build_scripts/build-sqlite3.sh COPY build_scripts/build-openssl.sh /build_scripts/ -RUN export OPENSSL_ROOT=openssl-1.1.1l && \ - export OPENSSL_HASH=0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 && \ +RUN export OPENSSL_ROOT=openssl-1.1.1m && \ + export OPENSSL_HASH=f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 && \ export OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source && \ manylinux-entrypoint /build_scripts/build-openssl.sh @@ -148,19 +142,21 @@ RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.8.12 FROM build_cpython AS build_cpython39 COPY build_scripts/ambv-pubkey.txt /build_scripts/cpython-pubkeys.txt -RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.9.8 +RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.9.10 FROM build_cpython AS all_python -COPY build_scripts/install-pypy.sh /build_scripts/install-pypy.sh -COPY build_scripts/pypy.sha256 /build_scripts/pypy.sha256 +COPY build_scripts/install-pypy.sh \ + build_scripts/pypy.sha256 \ + build_scripts/finalize-python.sh \ + /build_scripts/ RUN manylinux-entrypoint /build_scripts/install-pypy.sh 3.7 7.3.7 RUN manylinux-entrypoint /build_scripts/install-pypy.sh 3.8 7.3.7 COPY --from=build_cpython36 /opt/_internal /opt/_internal/ COPY --from=build_cpython37 /opt/_internal /opt/_internal/ COPY --from=build_cpython38 /opt/_internal /opt/_internal/ COPY --from=build_cpython39 /opt/_internal /opt/_internal/ -RUN hardlink -cv /opt/_internal +RUN manylinux-entrypoint /build_scripts/finalize-python.sh FROM runtime_base diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_rocm4_3_1 b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_rocm4_3_1 index 10f30e5ddd550..8a0d7ba2874d1 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_rocm4_3_1 +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_rocm4_3_1 @@ -69,15 +69,9 @@ RUN export LIBTOOL_ROOT=libtool-2.4.6 && \ export LIBTOOL_DOWNLOAD_URL=http://ftp.gnu.org/gnu/libtool && \ manylinux-entrypoint /build_scripts/install-libtool.sh -COPY build_scripts/install-patchelf.sh /build_scripts/ -RUN export PATCHELF_VERSION=0.13 && \ - export PATCHELF_HASH=60c6aeadb673de9cc1838b630c81f61e31c501de324ef7f1e8094a2431197d09 && \ - export PATCHELF_DOWNLOAD_URL=https://github.com/NixOS/patchelf/archive && \ - manylinux-entrypoint /build_scripts/install-patchelf.sh - COPY build_scripts/install-libxcrypt.sh /build_scripts/ -RUN export LIBXCRYPT_VERSION=4.4.26 && \ - export LIBXCRYPT_HASH=e8a544dd19171c1e6191a6044c96cc31496d781ba08b5a00f53310d001d58114 && \ +RUN export LIBXCRYPT_VERSION=4.4.27 && \ + export LIBXCRYPT_HASH=e4ff47b7fa5370fa08e27258f8a0de5cb7e9b09c297ec7ab56a8a82e229a1c84 && \ export LIBXCRYPT_DOWNLOAD_URL=https://github.com/besser82/libxcrypt/archive && \ export PERL_ROOT=perl-5.34.0 && \ export PERL_HASH=551efc818b968b05216024fb0b727ef2ad4c100f8cb6b43fab615fa78ae5be9a && \ @@ -98,8 +92,8 @@ RUN manylinux-entrypoint /build_scripts/install-build-packages.sh FROM build_base AS build_git COPY build_scripts/build-git.sh /build_scripts/ -RUN export GIT_ROOT=git-2.33.1 && \ - export GIT_HASH=02047f8dc8934d57ff5e02aadd8a2fe8e0bcf94a7158da375e48086cc46fce1d && \ +RUN export GIT_ROOT=git-2.34.1 && \ + export GIT_HASH=fc4eb5ecb9299db91cdd156c06cdeb41833f53adc5631ddf8c0cb13eaa2911c1 && \ export GIT_DOWNLOAD_URL=https://www.kernel.org/pub/software/scm/git && \ manylinux-entrypoint /build_scripts/build-git.sh @@ -117,14 +111,14 @@ RUN export SWIG_ROOT=swig-4.0.2 && \ FROM build_base AS build_cpython COPY build_scripts/build-sqlite3.sh /build_scripts/ -RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3360000 && \ - export SQLITE_AUTOCONF_HASH=bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3 && \ - export SQLITE_AUTOCONF_DOWNLOAD_URL=https://www.sqlite.org/2021 && \ +RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3370200 && \ + export SQLITE_AUTOCONF_HASH=4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8 && \ + export SQLITE_AUTOCONF_DOWNLOAD_URL=https://www.sqlite.org/2022 && \ manylinux-entrypoint /build_scripts/build-sqlite3.sh COPY build_scripts/build-openssl.sh /build_scripts/ -RUN export OPENSSL_ROOT=openssl-1.1.1l && \ - export OPENSSL_HASH=0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 && \ +RUN export OPENSSL_ROOT=openssl-1.1.1m && \ + export OPENSSL_HASH=f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 && \ export OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source && \ manylinux-entrypoint /build_scripts/build-openssl.sh @@ -148,19 +142,21 @@ RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.8.12 FROM build_cpython AS build_cpython39 COPY build_scripts/ambv-pubkey.txt /build_scripts/cpython-pubkeys.txt -RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.9.8 +RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.9.10 FROM build_cpython AS all_python -COPY build_scripts/install-pypy.sh /build_scripts/install-pypy.sh -COPY build_scripts/pypy.sha256 /build_scripts/pypy.sha256 +COPY build_scripts/install-pypy.sh \ + build_scripts/pypy.sha256 \ + build_scripts/finalize-python.sh \ + /build_scripts/ RUN manylinux-entrypoint /build_scripts/install-pypy.sh 3.7 7.3.7 RUN manylinux-entrypoint /build_scripts/install-pypy.sh 3.8 7.3.7 COPY --from=build_cpython36 /opt/_internal /opt/_internal/ COPY --from=build_cpython37 /opt/_internal /opt/_internal/ COPY --from=build_cpython38 /opt/_internal /opt/_internal/ COPY --from=build_cpython39 /opt/_internal /opt/_internal/ -RUN hardlink -cv /opt/_internal +RUN manylinux-entrypoint /build_scripts/finalize-python.sh FROM runtime_base diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_training_cuda10_2 b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_training_cuda10_2 index 15aa8dde5ee44..c87c2eef65c6d 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_training_cuda10_2 +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_training_cuda10_2 @@ -65,15 +65,9 @@ RUN export LIBTOOL_ROOT=libtool-2.4.6 && \ export LIBTOOL_DOWNLOAD_URL=http://ftp.gnu.org/gnu/libtool && \ manylinux-entrypoint /build_scripts/install-libtool.sh -COPY build_scripts/install-patchelf.sh /build_scripts/ -RUN export PATCHELF_VERSION=0.13 && \ - export PATCHELF_HASH=60c6aeadb673de9cc1838b630c81f61e31c501de324ef7f1e8094a2431197d09 && \ - export PATCHELF_DOWNLOAD_URL=https://github.com/NixOS/patchelf/archive && \ - manylinux-entrypoint /build_scripts/install-patchelf.sh - COPY build_scripts/install-libxcrypt.sh /build_scripts/ -RUN export LIBXCRYPT_VERSION=4.4.26 && \ - export LIBXCRYPT_HASH=e8a544dd19171c1e6191a6044c96cc31496d781ba08b5a00f53310d001d58114 && \ +RUN export LIBXCRYPT_VERSION=4.4.27 && \ + export LIBXCRYPT_HASH=e4ff47b7fa5370fa08e27258f8a0de5cb7e9b09c297ec7ab56a8a82e229a1c84 && \ export LIBXCRYPT_DOWNLOAD_URL=https://github.com/besser82/libxcrypt/archive && \ export PERL_ROOT=perl-5.34.0 && \ export PERL_HASH=551efc818b968b05216024fb0b727ef2ad4c100f8cb6b43fab615fa78ae5be9a && \ @@ -87,8 +81,8 @@ RUN manylinux-entrypoint /build_scripts/install-build-packages.sh FROM build_base AS build_git COPY build_scripts/build-git.sh /build_scripts/ -RUN export GIT_ROOT=git-2.33.1 && \ - export GIT_HASH=02047f8dc8934d57ff5e02aadd8a2fe8e0bcf94a7158da375e48086cc46fce1d && \ +RUN export GIT_ROOT=git-2.34.1 && \ + export GIT_HASH=fc4eb5ecb9299db91cdd156c06cdeb41833f53adc5631ddf8c0cb13eaa2911c1 && \ export GIT_DOWNLOAD_URL=https://www.kernel.org/pub/software/scm/git && \ manylinux-entrypoint /build_scripts/build-git.sh @@ -106,14 +100,14 @@ RUN export SWIG_ROOT=swig-4.0.2 && \ FROM build_base AS build_cpython COPY build_scripts/build-sqlite3.sh /build_scripts/ -RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3360000 && \ - export SQLITE_AUTOCONF_HASH=bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3 && \ - export SQLITE_AUTOCONF_DOWNLOAD_URL=https://www.sqlite.org/2021 && \ +RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3370200 && \ + export SQLITE_AUTOCONF_HASH=4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8 && \ + export SQLITE_AUTOCONF_DOWNLOAD_URL=https://www.sqlite.org/2022 && \ manylinux-entrypoint /build_scripts/build-sqlite3.sh COPY build_scripts/build-openssl.sh /build_scripts/ -RUN export OPENSSL_ROOT=openssl-1.1.1l && \ - export OPENSSL_HASH=0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 && \ +RUN export OPENSSL_ROOT=openssl-1.1.1m && \ + export OPENSSL_HASH=f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 && \ export OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source && \ manylinux-entrypoint /build_scripts/build-openssl.sh @@ -137,17 +131,19 @@ RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.8.12 FROM build_cpython AS build_cpython39 COPY build_scripts/ambv-pubkey.txt /build_scripts/cpython-pubkeys.txt -RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.9.8 +RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.9.10 FROM build_cpython AS build_cpython310 COPY build_scripts/cpython-pubkey-310-311.txt /build_scripts/cpython-pubkeys.txt -RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.10.0 +RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.10.2 FROM build_cpython AS all_python -COPY build_scripts/install-pypy.sh /build_scripts/install-pypy.sh -COPY build_scripts/pypy.sha256 /build_scripts/pypy.sha256 +COPY build_scripts/install-pypy.sh \ + build_scripts/pypy.sha256 \ + build_scripts/finalize-python.sh \ + /build_scripts/ RUN manylinux-entrypoint /build_scripts/install-pypy.sh 3.7 7.3.7 RUN manylinux-entrypoint /build_scripts/install-pypy.sh 3.8 7.3.7 COPY --from=build_cpython36 /opt/_internal /opt/_internal/ @@ -155,7 +151,7 @@ COPY --from=build_cpython37 /opt/_internal /opt/_internal/ COPY --from=build_cpython38 /opt/_internal /opt/_internal/ COPY --from=build_cpython39 /opt/_internal /opt/_internal/ COPY --from=build_cpython310 /opt/_internal /opt/_internal/ -RUN hardlink -cv /opt/_internal +RUN manylinux-entrypoint /build_scripts/finalize-python.sh FROM runtime_base diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_training_cuda11_1 b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_training_cuda11_1 index 4236a066afa69..c20e1fe2194af 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_training_cuda11_1 +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_training_cuda11_1 @@ -65,15 +65,9 @@ RUN export LIBTOOL_ROOT=libtool-2.4.6 && \ export LIBTOOL_DOWNLOAD_URL=http://ftp.gnu.org/gnu/libtool && \ manylinux-entrypoint /build_scripts/install-libtool.sh -COPY build_scripts/install-patchelf.sh /build_scripts/ -RUN export PATCHELF_VERSION=0.13 && \ - export PATCHELF_HASH=60c6aeadb673de9cc1838b630c81f61e31c501de324ef7f1e8094a2431197d09 && \ - export PATCHELF_DOWNLOAD_URL=https://github.com/NixOS/patchelf/archive && \ - manylinux-entrypoint /build_scripts/install-patchelf.sh - COPY build_scripts/install-libxcrypt.sh /build_scripts/ -RUN export LIBXCRYPT_VERSION=4.4.26 && \ - export LIBXCRYPT_HASH=e8a544dd19171c1e6191a6044c96cc31496d781ba08b5a00f53310d001d58114 && \ +RUN export LIBXCRYPT_VERSION=4.4.27 && \ + export LIBXCRYPT_HASH=e4ff47b7fa5370fa08e27258f8a0de5cb7e9b09c297ec7ab56a8a82e229a1c84 && \ export LIBXCRYPT_DOWNLOAD_URL=https://github.com/besser82/libxcrypt/archive && \ export PERL_ROOT=perl-5.34.0 && \ export PERL_HASH=551efc818b968b05216024fb0b727ef2ad4c100f8cb6b43fab615fa78ae5be9a && \ @@ -87,8 +81,8 @@ RUN manylinux-entrypoint /build_scripts/install-build-packages.sh FROM build_base AS build_git COPY build_scripts/build-git.sh /build_scripts/ -RUN export GIT_ROOT=git-2.33.1 && \ - export GIT_HASH=02047f8dc8934d57ff5e02aadd8a2fe8e0bcf94a7158da375e48086cc46fce1d && \ +RUN export GIT_ROOT=git-2.34.1 && \ + export GIT_HASH=fc4eb5ecb9299db91cdd156c06cdeb41833f53adc5631ddf8c0cb13eaa2911c1 && \ export GIT_DOWNLOAD_URL=https://www.kernel.org/pub/software/scm/git && \ manylinux-entrypoint /build_scripts/build-git.sh @@ -106,14 +100,14 @@ RUN export SWIG_ROOT=swig-4.0.2 && \ FROM build_base AS build_cpython COPY build_scripts/build-sqlite3.sh /build_scripts/ -RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3360000 && \ - export SQLITE_AUTOCONF_HASH=bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3 && \ - export SQLITE_AUTOCONF_DOWNLOAD_URL=https://www.sqlite.org/2021 && \ +RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3370200 && \ + export SQLITE_AUTOCONF_HASH=4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8 && \ + export SQLITE_AUTOCONF_DOWNLOAD_URL=https://www.sqlite.org/2022 && \ manylinux-entrypoint /build_scripts/build-sqlite3.sh COPY build_scripts/build-openssl.sh /build_scripts/ -RUN export OPENSSL_ROOT=openssl-1.1.1l && \ - export OPENSSL_HASH=0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 && \ +RUN export OPENSSL_ROOT=openssl-1.1.1m && \ + export OPENSSL_HASH=f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 && \ export OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source && \ manylinux-entrypoint /build_scripts/build-openssl.sh @@ -137,17 +131,19 @@ RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.8.12 FROM build_cpython AS build_cpython39 COPY build_scripts/ambv-pubkey.txt /build_scripts/cpython-pubkeys.txt -RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.9.8 +RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.9.10 FROM build_cpython AS build_cpython310 COPY build_scripts/cpython-pubkey-310-311.txt /build_scripts/cpython-pubkeys.txt -RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.10.0 +RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.10.2 FROM build_cpython AS all_python -COPY build_scripts/install-pypy.sh /build_scripts/install-pypy.sh -COPY build_scripts/pypy.sha256 /build_scripts/pypy.sha256 +COPY build_scripts/install-pypy.sh \ + build_scripts/pypy.sha256 \ + build_scripts/finalize-python.sh \ + /build_scripts/ RUN manylinux-entrypoint /build_scripts/install-pypy.sh 3.7 7.3.7 RUN manylinux-entrypoint /build_scripts/install-pypy.sh 3.8 7.3.7 COPY --from=build_cpython36 /opt/_internal /opt/_internal/ @@ -155,7 +151,7 @@ COPY --from=build_cpython37 /opt/_internal /opt/_internal/ COPY --from=build_cpython38 /opt/_internal /opt/_internal/ COPY --from=build_cpython39 /opt/_internal /opt/_internal/ COPY --from=build_cpython310 /opt/_internal /opt/_internal/ -RUN hardlink -cv /opt/_internal +RUN manylinux-entrypoint /build_scripts/finalize-python.sh FROM runtime_base diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_training_cuda11_3 b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_training_cuda11_3 index d74bf2c740dd3..f88c3acf1ec28 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_training_cuda11_3 +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_training_cuda11_3 @@ -65,15 +65,9 @@ RUN export LIBTOOL_ROOT=libtool-2.4.6 && \ export LIBTOOL_DOWNLOAD_URL=http://ftp.gnu.org/gnu/libtool && \ manylinux-entrypoint /build_scripts/install-libtool.sh -COPY build_scripts/install-patchelf.sh /build_scripts/ -RUN export PATCHELF_VERSION=0.13 && \ - export PATCHELF_HASH=60c6aeadb673de9cc1838b630c81f61e31c501de324ef7f1e8094a2431197d09 && \ - export PATCHELF_DOWNLOAD_URL=https://github.com/NixOS/patchelf/archive && \ - manylinux-entrypoint /build_scripts/install-patchelf.sh - COPY build_scripts/install-libxcrypt.sh /build_scripts/ -RUN export LIBXCRYPT_VERSION=4.4.26 && \ - export LIBXCRYPT_HASH=e8a544dd19171c1e6191a6044c96cc31496d781ba08b5a00f53310d001d58114 && \ +RUN export LIBXCRYPT_VERSION=4.4.27 && \ + export LIBXCRYPT_HASH=e4ff47b7fa5370fa08e27258f8a0de5cb7e9b09c297ec7ab56a8a82e229a1c84 && \ export LIBXCRYPT_DOWNLOAD_URL=https://github.com/besser82/libxcrypt/archive && \ export PERL_ROOT=perl-5.34.0 && \ export PERL_HASH=551efc818b968b05216024fb0b727ef2ad4c100f8cb6b43fab615fa78ae5be9a && \ @@ -87,8 +81,8 @@ RUN manylinux-entrypoint /build_scripts/install-build-packages.sh FROM build_base AS build_git COPY build_scripts/build-git.sh /build_scripts/ -RUN export GIT_ROOT=git-2.33.1 && \ - export GIT_HASH=02047f8dc8934d57ff5e02aadd8a2fe8e0bcf94a7158da375e48086cc46fce1d && \ +RUN export GIT_ROOT=git-2.34.1 && \ + export GIT_HASH=fc4eb5ecb9299db91cdd156c06cdeb41833f53adc5631ddf8c0cb13eaa2911c1 && \ export GIT_DOWNLOAD_URL=https://www.kernel.org/pub/software/scm/git && \ manylinux-entrypoint /build_scripts/build-git.sh @@ -106,14 +100,14 @@ RUN export SWIG_ROOT=swig-4.0.2 && \ FROM build_base AS build_cpython COPY build_scripts/build-sqlite3.sh /build_scripts/ -RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3360000 && \ - export SQLITE_AUTOCONF_HASH=bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3 && \ - export SQLITE_AUTOCONF_DOWNLOAD_URL=https://www.sqlite.org/2021 && \ +RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3370200 && \ + export SQLITE_AUTOCONF_HASH=4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8 && \ + export SQLITE_AUTOCONF_DOWNLOAD_URL=https://www.sqlite.org/2022 && \ manylinux-entrypoint /build_scripts/build-sqlite3.sh COPY build_scripts/build-openssl.sh /build_scripts/ -RUN export OPENSSL_ROOT=openssl-1.1.1l && \ - export OPENSSL_HASH=0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 && \ +RUN export OPENSSL_ROOT=openssl-1.1.1m && \ + export OPENSSL_HASH=f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 && \ export OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source && \ manylinux-entrypoint /build_scripts/build-openssl.sh @@ -137,17 +131,19 @@ RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.8.12 FROM build_cpython AS build_cpython39 COPY build_scripts/ambv-pubkey.txt /build_scripts/cpython-pubkeys.txt -RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.9.8 +RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.9.10 FROM build_cpython AS build_cpython310 COPY build_scripts/cpython-pubkey-310-311.txt /build_scripts/cpython-pubkeys.txt -RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.10.0 +RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.10.2 FROM build_cpython AS all_python -COPY build_scripts/install-pypy.sh /build_scripts/install-pypy.sh -COPY build_scripts/pypy.sha256 /build_scripts/pypy.sha256 +COPY build_scripts/install-pypy.sh \ + build_scripts/pypy.sha256 \ + build_scripts/finalize-python.sh \ + /build_scripts/ RUN manylinux-entrypoint /build_scripts/install-pypy.sh 3.7 7.3.7 RUN manylinux-entrypoint /build_scripts/install-pypy.sh 3.8 7.3.7 COPY --from=build_cpython36 /opt/_internal /opt/_internal/ @@ -155,7 +151,7 @@ COPY --from=build_cpython37 /opt/_internal /opt/_internal/ COPY --from=build_cpython38 /opt/_internal /opt/_internal/ COPY --from=build_cpython39 /opt/_internal /opt/_internal/ COPY --from=build_cpython310 /opt/_internal /opt/_internal/ -RUN hardlink -cv /opt/_internal +RUN manylinux-entrypoint /build_scripts/finalize-python.sh FROM runtime_base diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_training_cuda11_4 b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_training_cuda11_4 index 1a7eb16bf886c..6d05acd6e756a 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_training_cuda11_4 +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_training_cuda11_4 @@ -65,15 +65,9 @@ RUN export LIBTOOL_ROOT=libtool-2.4.6 && \ export LIBTOOL_DOWNLOAD_URL=http://ftp.gnu.org/gnu/libtool && \ manylinux-entrypoint /build_scripts/install-libtool.sh -COPY build_scripts/install-patchelf.sh /build_scripts/ -RUN export PATCHELF_VERSION=0.13 && \ - export PATCHELF_HASH=60c6aeadb673de9cc1838b630c81f61e31c501de324ef7f1e8094a2431197d09 && \ - export PATCHELF_DOWNLOAD_URL=https://github.com/NixOS/patchelf/archive && \ - manylinux-entrypoint /build_scripts/install-patchelf.sh - COPY build_scripts/install-libxcrypt.sh /build_scripts/ -RUN export LIBXCRYPT_VERSION=4.4.26 && \ - export LIBXCRYPT_HASH=e8a544dd19171c1e6191a6044c96cc31496d781ba08b5a00f53310d001d58114 && \ +RUN export LIBXCRYPT_VERSION=4.4.27 && \ + export LIBXCRYPT_HASH=e4ff47b7fa5370fa08e27258f8a0de5cb7e9b09c297ec7ab56a8a82e229a1c84 && \ export LIBXCRYPT_DOWNLOAD_URL=https://github.com/besser82/libxcrypt/archive && \ export PERL_ROOT=perl-5.34.0 && \ export PERL_HASH=551efc818b968b05216024fb0b727ef2ad4c100f8cb6b43fab615fa78ae5be9a && \ @@ -87,8 +81,8 @@ RUN manylinux-entrypoint /build_scripts/install-build-packages.sh FROM build_base AS build_git COPY build_scripts/build-git.sh /build_scripts/ -RUN export GIT_ROOT=git-2.33.1 && \ - export GIT_HASH=02047f8dc8934d57ff5e02aadd8a2fe8e0bcf94a7158da375e48086cc46fce1d && \ +RUN export GIT_ROOT=git-2.34.1 && \ + export GIT_HASH=fc4eb5ecb9299db91cdd156c06cdeb41833f53adc5631ddf8c0cb13eaa2911c1 && \ export GIT_DOWNLOAD_URL=https://www.kernel.org/pub/software/scm/git && \ manylinux-entrypoint /build_scripts/build-git.sh @@ -106,14 +100,14 @@ RUN export SWIG_ROOT=swig-4.0.2 && \ FROM build_base AS build_cpython COPY build_scripts/build-sqlite3.sh /build_scripts/ -RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3360000 && \ - export SQLITE_AUTOCONF_HASH=bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3 && \ - export SQLITE_AUTOCONF_DOWNLOAD_URL=https://www.sqlite.org/2021 && \ +RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3370200 && \ + export SQLITE_AUTOCONF_HASH=4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8 && \ + export SQLITE_AUTOCONF_DOWNLOAD_URL=https://www.sqlite.org/2022 && \ manylinux-entrypoint /build_scripts/build-sqlite3.sh COPY build_scripts/build-openssl.sh /build_scripts/ -RUN export OPENSSL_ROOT=openssl-1.1.1l && \ - export OPENSSL_HASH=0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 && \ +RUN export OPENSSL_ROOT=openssl-1.1.1m && \ + export OPENSSL_HASH=f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 && \ export OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source && \ manylinux-entrypoint /build_scripts/build-openssl.sh @@ -137,17 +131,19 @@ RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.8.12 FROM build_cpython AS build_cpython39 COPY build_scripts/ambv-pubkey.txt /build_scripts/cpython-pubkeys.txt -RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.9.8 +RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.9.10 FROM build_cpython AS build_cpython310 COPY build_scripts/cpython-pubkey-310-311.txt /build_scripts/cpython-pubkeys.txt -RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.10.0 +RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.10.2 FROM build_cpython AS all_python -COPY build_scripts/install-pypy.sh /build_scripts/install-pypy.sh -COPY build_scripts/pypy.sha256 /build_scripts/pypy.sha256 +COPY build_scripts/install-pypy.sh \ + build_scripts/pypy.sha256 \ + build_scripts/finalize-python.sh \ + /build_scripts/ RUN manylinux-entrypoint /build_scripts/install-pypy.sh 3.7 7.3.7 RUN manylinux-entrypoint /build_scripts/install-pypy.sh 3.8 7.3.7 COPY --from=build_cpython36 /opt/_internal /opt/_internal/ @@ -155,7 +151,7 @@ COPY --from=build_cpython37 /opt/_internal /opt/_internal/ COPY --from=build_cpython38 /opt/_internal /opt/_internal/ COPY --from=build_cpython39 /opt/_internal /opt/_internal/ COPY --from=build_cpython310 /opt/_internal /opt/_internal/ -RUN hardlink -cv /opt/_internal +RUN manylinux-entrypoint /build_scripts/finalize-python.sh FROM runtime_base diff --git a/tools/ci_build/github/linux/docker/build_scripts/README.md b/tools/ci_build/github/linux/docker/build_scripts/README.md index dcc02f8148ca1..cadf810b69a65 100644 --- a/tools/ci_build/github/linux/docker/build_scripts/README.md +++ b/tools/ci_build/github/linux/docker/build_scripts/README.md @@ -1,4 +1,4 @@ -All the files in this folder were copied from https://github.com/pypa/manylinux (commit id 28723f3e3330e5de156d2179353d45b04339a528) with two tiny changes: +All the files in this folder were copied from https://github.com/pypa/manylinux (commit id 72ab18b4f3d83469c4e497cdb5a3877044808930) with two tiny changes: ```diff diff -r /data/bt/os/manylinux/docker/build_scripts/install-entrypoint.sh ./install-entrypoint.sh diff --git a/tools/ci_build/github/linux/docker/build_scripts/build-cmake.sh b/tools/ci_build/github/linux/docker/build_scripts/build-cmake.sh deleted file mode 100755 index cc63ca2436d22..0000000000000 --- a/tools/ci_build/github/linux/docker/build_scripts/build-cmake.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -# Top-level build script called from Dockerfile - -# Stop at any error, show all commands -set -exuo pipefail - -# Get script directory -MY_DIR=$(dirname "${BASH_SOURCE[0]}") - -# Get build utilities -source $MY_DIR/build_utils.sh - -# Install newest cmake -check_var ${CMAKE_VERSION} -check_var ${CMAKE_HASH} -check_var ${CMAKE_DOWNLOAD_URL} - -fetch_source cmake-${CMAKE_VERSION}.tar.gz ${CMAKE_DOWNLOAD_URL}/v${CMAKE_VERSION} -check_sha256sum cmake-${CMAKE_VERSION}.tar.gz ${CMAKE_HASH} -tar -xzf cmake-${CMAKE_VERSION}.tar.gz -pushd cmake-${CMAKE_VERSION} -export CPPFLAGS="${MANYLINUX_CPPFLAGS}" -export CFLAGS="${MANYLINUX_CFLAGS} ${CPPFLAGS}" -export CXXFLAGS="${MANYLINUX_CXXFLAGS} ${CPPFLAGS}" -export LDFLAGS="${MANYLINUX_LDFLAGS}" -./bootstrap --system-curl --parallel=$(nproc) -make -j$(nproc) -make install DESTDIR=/manylinux-rootfs -popd -rm -rf cmake-${CMAKE_VERSION}.tar.gz cmake-${CMAKE_VERSION} - -# remove help -rm -rf /manylinux-rootfs/usr/local/share/cmake-*/Help - -# Strip what we can -strip_ /manylinux-rootfs - -# Install -cp -rlf /manylinux-rootfs/* / - - -cmake --version diff --git a/tools/ci_build/github/linux/docker/build_scripts/build-cpython.sh b/tools/ci_build/github/linux/docker/build_scripts/build-cpython.sh index 71b6aa14dfc4f..699d43a646d5f 100755 --- a/tools/ci_build/github/linux/docker/build_scripts/build-cpython.sh +++ b/tools/ci_build/github/linux/docker/build_scripts/build-cpython.sh @@ -55,9 +55,6 @@ fi popd rm -rf Python-${CPYTHON_VERSION} Python-${CPYTHON_VERSION}.tgz Python-${CPYTHON_VERSION}.tgz.asc -# we don't need libpython*.a, and they're many megabytes -find ${PREFIX} -name '*.a' -print0 | xargs -0 rm -f - # We do not need precompiled .pyc and .pyo files. clean_pyc ${PREFIX} diff --git a/tools/ci_build/github/linux/docker/build_scripts/build-openssl.sh b/tools/ci_build/github/linux/docker/build_scripts/build-openssl.sh index 509a9d31960bb..49dd769e1929a 100755 --- a/tools/ci_build/github/linux/docker/build_scripts/build-openssl.sh +++ b/tools/ci_build/github/linux/docker/build_scripts/build-openssl.sh @@ -18,8 +18,10 @@ check_var ${OPENSSL_DOWNLOAD_URL} OPENSSL_VERSION=${OPENSSL_ROOT#*-} OPENSSL_MIN_VERSION=1.1.1 -INSTALLED=$(openssl version | head -1 | awk '{ print $2 }') -SMALLEST=$(echo -e "${INSTALLED}\n${OPENSSL_MIN_VERSION}" | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | head -1) +# || test $? -eq 141 is there to ignore SIGPIPE with set -o pipefail +# c.f. https://stackoverflow.com/questions/22464786/ignoring-bash-pipefail-for-error-code-141#comment60412687_33026977 +INSTALLED=$((openssl version | head -1 || test $? -eq 141) | awk '{ print $2 }') +SMALLEST=$(echo -e "${INSTALLED}\n${OPENSSL_MIN_VERSION}" | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | head -1 || test $? -eq 141) # Ignore letters in version numbers if [ "${SMALLEST}" = "${OPENSSL_MIN_VERSION}" ]; then diff --git a/tools/ci_build/github/linux/docker/build_scripts/finalize-python.sh b/tools/ci_build/github/linux/docker/build_scripts/finalize-python.sh new file mode 100755 index 0000000000000..218def3b4b7b0 --- /dev/null +++ b/tools/ci_build/github/linux/docker/build_scripts/finalize-python.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +# Stop at any error, show all commands +set -exuo pipefail + +# most people don't need libpython*.a, and they're many megabytes. +# compress them all together for best efficiency +pushd /opt/_internal +XZ_OPT=-9e tar -cJf static-libs-for-embedding-only.tar.xz cpython-*/lib/libpython*.a +popd +find /opt/_internal -name '*.a' -print0 | xargs -0 rm -f + +hardlink -cv /opt/_internal diff --git a/tools/ci_build/github/linux/docker/build_scripts/requirements-base-tools.txt b/tools/ci_build/github/linux/docker/build_scripts/requirements-base-tools.txt index aa3262855c1f9..008ba4573b945 100644 --- a/tools/ci_build/github/linux/docker/build_scripts/requirements-base-tools.txt +++ b/tools/ci_build/github/linux/docker/build_scripts/requirements-base-tools.txt @@ -4,9 +4,9 @@ # # pip-compile --generate-hashes --output-file=docker/build_scripts/requirements-base-tools.txt requirements-base-tools.in # -argcomplete==1.12.3 \ - --hash=sha256:291f0beca7fd49ce285d2f10e4c1c77e9460cf823eef2de54df0c0fec88b0d81 \ - --hash=sha256:2c7dbffd8c045ea534921e63b0be6fe65e88599990d8dc408ac8c542b72a5445 +argcomplete==2.0.0 \ + --hash=sha256:6372ad78c89d662035101418ae253668445b391755cfe94ea52f1b9d22425b20 \ + --hash=sha256:cffa11ea77999bb0dd27bb25ff6dc142a6796142f68d45b1a26b11f58724561e # via pipx certifi==2021.10.8 \ --hash=sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872 \ @@ -16,17 +16,17 @@ click==8.0.3 \ --hash=sha256:353f466495adaeb40b6b5f592f9f91cb22372351c84caeb068132442a4518ef3 \ --hash=sha256:410e932b050f5eed773c4cda94de75971c89cdb3155a72a0831139a79e5ecb5b # via userpath -packaging==21.2 \ - --hash=sha256:096d689d78ca690e4cd8a89568ba06d07ca097e3306a4381635073ca91479966 \ - --hash=sha256:14317396d1e8cdb122989b916fa2c7e9ca8e2be9e8060a6eff75b6b7b4d8a7e0 +packaging==21.3 \ + --hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \ + --hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522 # via pipx -pipx==0.16.4 \ - --hash=sha256:992e78082c0b33c7bc708176ce9e0df9bac9ae3b08bf111c368571bc32e723d6 \ - --hash=sha256:e207e1b1a9014bdb0c484b974381fc5a96729685dba91355888372172d1e3264 +pipx==1.0.0 \ + --hash=sha256:91e2bca934a5e82785d7b4ae44b95553611311691bd87da31915d08a0ad2df1c \ + --hash=sha256:b106042da7b0b225e3b2f681c7b4703aa964360adcf2deea591ad6e33882d2bc # via -r requirements-base-tools.in -pyparsing==2.4.7 \ - --hash=sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1 \ - --hash=sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b +pyparsing==3.0.7 \ + --hash=sha256:18ee9022775d270c55187733956460083db60b37d0d0fb357445f3094eed3eea \ + --hash=sha256:a6c06a88f252e6c322f65faf8f418b16213b51bdfaece0524c1c1bc30c63c484 # via packaging userpath==1.7.0 \ --hash=sha256:4c3d3b611706a8b0c6309510c8b1a774c54eb491cafe7df58dc5571c0bee30e2 \ diff --git a/tools/ci_build/github/linux/docker/build_scripts/requirements-tools/auditwheel b/tools/ci_build/github/linux/docker/build_scripts/requirements-tools/auditwheel index a01ef4a747468..f7ddcb0396c93 100644 --- a/tools/ci_build/github/linux/docker/build_scripts/requirements-tools/auditwheel +++ b/tools/ci_build/github/linux/docker/build_scripts/requirements-tools/auditwheel @@ -4,9 +4,9 @@ # # pip-compile --generate-hashes --output-file=docker/build_scripts/requirements-tools/auditwheel .nox/update_python_tools/tmp/auditwheel.in # -auditwheel==5.0.0 \ - --hash=sha256:1a38a93eb19ef1494fe395433bc7d485ffc92a95d50791c6ab091975c57d1f0a \ - --hash=sha256:21332deca38abcc2cf3a9230a3b7f315115ab9f8f4bbbec4a562edb358d7cd4b +auditwheel==5.1.2 \ + --hash=sha256:3ee5830014931ea84af5cd065c637b6614efa03d9b88bd8fbfc924e7ed01d6ba \ + --hash=sha256:4d06aea3ab59a2b8aa733798ac221556a3f5c021fddc42e5de5bcef20201c031 # via -r .nox/update_python_tools/tmp/auditwheel.in pyelftools==0.27 \ --hash=sha256:5609aa6da1123fccfae2e8431a67b4146aa7fad5b3889f808df12b110f230937 \ diff --git a/tools/ci_build/github/linux/docker/build_scripts/requirements-tools/cmake b/tools/ci_build/github/linux/docker/build_scripts/requirements-tools/cmake index 6bf0b5f04dbb4..d55f47c53dae1 100644 --- a/tools/ci_build/github/linux/docker/build_scripts/requirements-tools/cmake +++ b/tools/ci_build/github/linux/docker/build_scripts/requirements-tools/cmake @@ -4,21 +4,21 @@ # # pip-compile --generate-hashes --output-file=docker/build_scripts/requirements-tools/cmake .nox/update_python_tools/tmp/cmake.in # -cmake==3.21.4 \ - --hash=sha256:05e3248e84150a1292600bc671cb311c4a9bdb0af64d5045c27d4ed3b7813be7 \ - --hash=sha256:13798c525cca8cb57598f0f7040a1a81579b9d08188950d9595ef2c2eff10a84 \ - --hash=sha256:30fa5ed8a5ad66dcd263adb87f3ce3dc2d0ec0ac3958f5becff577e4b62cd065 \ - --hash=sha256:3673a1fab9f249f606ecfd73248fbeea66f3ed9d3c12dfe539b2b6aa63614ef9 \ - --hash=sha256:36cf800ff3286980f4717852b7d4dd89aa66568e1d793fa5e3276361f1241ef8 \ - --hash=sha256:399f9219ba38ceba4d38f8b1150b9a2b11960bb4ed481a9686b522884d17e9f9 \ - --hash=sha256:6e8ae2e7da141e768e29bd9d140c7feed4479ac21251a2550d027cb9f9a349db \ - --hash=sha256:9b00f557b9269d3d79cb5feb76c1a69e8aa5f608c617c08f82c94d6af4178f14 \ - --hash=sha256:c2d93cec76e23dae10ef4a91e24ddb544422e6231cf06d2e602976c2e078977e \ - --hash=sha256:c970fb61b81c9fc7ca08329ce2b01235323292b52994bc97956d47967c4499dc \ - --hash=sha256:cb59e6add997e40af53e83288dd74b111732adb455548d52940b1ef1f6f43589 \ - --hash=sha256:d7bbf5e3f7bedcb8ab7478c383739098af11170edad204659e6191ff95b960f4 \ - --hash=sha256:d84a7903ba73a453c7566f015a072c65b3a26d9acbcbbed0ec8582c6c81c4c84 \ - --hash=sha256:dc8c851bdd5c18f2238fcc86778285b14a9f5846d2f7e9c426ed52c636d4071c \ - --hash=sha256:e0db55681ed10b7175f7fd8e8f31ab18bc299bf534cc8fd31917bb2ffd3596ce \ - --hash=sha256:edba9012ee4b4dd25d5a58facd3c70f0a4412838d6e03714036f90ce04acd7ee +cmake==3.22.1 \ + --hash=sha256:153ab8c7d8bb6a0b6741a247ea89c3f269105e91b52cf44d7c51394193a3a94f \ + --hash=sha256:1a8023e21b538520b75c0166236164ae9ae08ac0b3edcc2aeafd436030aaae0d \ + --hash=sha256:33d081e76237c38cf115f7eecdaa277d914e4a57afbeb93229de293fc1418cfd \ + --hash=sha256:360eb0ab90e5ba08ab651bf088e7bd56f2c41022e5cde5e9caef274f1466f133 \ + --hash=sha256:493e436ac33ddb39238999f5c04c5767a1eec9c15b2e1284222cff067d2a8901 \ + --hash=sha256:5135c2039fd5e147857ea3aceefea5de00cfdd9f911f94fc987f35cd5b0b71af \ + --hash=sha256:55e7d61e48492f9a7561b4849ef0287dd858c76dd70a22b47b5c71b8d8ebdd5c \ + --hash=sha256:609fe01e8b8241f4190f28d3e71f189c2272e7d7739568443b35fe1b0dea6494 \ + --hash=sha256:75d1573037748d5be4c73a51ef1a338bf21757aaddef5b532abf33f4333cd3ae \ + --hash=sha256:99cd7a3a33f6b78cb211334e120ed8d22f80c614d349e2b93fd958e0e9b89f7e \ + --hash=sha256:aef8619108fe43abc92782faf63d26b63fc56a5ab956de9c8b5d72240c800512 \ + --hash=sha256:bf7718fe37c755a1430099149cd23099dc024868c42cab9db2b6c8fe8a11c881 \ + --hash=sha256:d6f78f6e6f728e08a9f330942d8175f8234051328f8e060e2e5155f12f6edf0a \ + --hash=sha256:dc9339db41ca0c208c082df3fb8ecb2ef62e38af5a9ccc0fe3ce2d91aa8eb2e8 \ + --hash=sha256:e33657f8c2e49e8dc4f1714a94c1fc6a74656001f1ee2187c4f7e9f1ed641860 \ + --hash=sha256:f4bd2d162d81419c8310062913b574836e5bb04edf639cc25b5a7d4020a3a572 # via -r .nox/update_python_tools/tmp/cmake.in diff --git a/tools/ci_build/github/linux/docker/build_scripts/requirements-tools/patchelf b/tools/ci_build/github/linux/docker/build_scripts/requirements-tools/patchelf new file mode 100644 index 0000000000000..dac3034e32fb4 --- /dev/null +++ b/tools/ci_build/github/linux/docker/build_scripts/requirements-tools/patchelf @@ -0,0 +1,14 @@ +# +# This file is autogenerated by pip-compile with python 3.9 +# To update, run: +# +# pip-compile --generate-hashes --output-file=docker/build_scripts/requirements-tools/patchelf .nox/update_python_tools/tmp/patchelf.in +# +patchelf==0.14.3.0 \ + --hash=sha256:04cdeea7b24d8daca78e885a113791cedb278eb164a1760c509702d6ed155a46 \ + --hash=sha256:09ad55d9dff020ecab75d02ae592b6ff7997fc0428ce7ffb35213b3fdd79dad7 \ + --hash=sha256:0c778f7af59bd781d187ea27556a1ad3e0dd044d85c77536a7c9d2cc027ff0fc \ + --hash=sha256:4b3ee96c6ac9b2059f038db2838bc0be4d119d3b5b8b0cc252e5cadd832a5ae5 \ + --hash=sha256:a8dd89901f32f0ce93a5c995a8f9eb79908d43e3a70eaf6b8efe8643976e6a8c \ + --hash=sha256:fa208aee4b0e6b3f4dbd1bb2be82b1d2635e045e7dfe227b2095bb2e3db67811 + # via -r .nox/update_python_tools/tmp/patchelf.in diff --git a/tools/ci_build/github/linux/docker/build_scripts/requirements.txt b/tools/ci_build/github/linux/docker/build_scripts/requirements.txt deleted file mode 100644 index 18e668c3a2939..0000000000000 --- a/tools/ci_build/github/linux/docker/build_scripts/requirements.txt +++ /dev/null @@ -1,36 +0,0 @@ -# pip requirements for all cpythons -# NOTE: pip has GPG signatures; could download and verify independently. -pip==21.1.1 \ - --hash=sha256:11d095ed5c15265fc5c15cc40a45188675c239fb0f9913b673a33e54ff7d45f0 \ - --hash=sha256:51ad01ddcd8de923533b01a870e7b987c2eb4d83b50b89e1bf102723ff9fed8b -wheel==0.36.2 \ - --hash=sha256:78b5b185f0e5763c26ca1e324373aadd49182ca90e825f7853f4b2509215dc0e \ - --hash=sha256:e11eefd162658ea59a60a0f6c7d493a7190ea4b9a85e335b33489d9f17e0245e -setuptools==56.2.0 \ - --hash=sha256:bc30153eec47d82f20c6f5e1a13d4ee725c6deb7013a67557f89bfe5d25235c4 \ - --hash=sha256:7bb5652625e94e73b9358b7ed8c6431b732e80cf31f4e0972294c64f0e5b849e -build==0.3.1.post1 \ - --hash=sha256:88bc8ff6cb948247bebd5b3bf6b8b71d10fd93bce848f9d2fd9b28cbdd40ae8b \ - --hash=sha256:85123bf327404e68142b1eb2a8298b052e984ad5b12738549688371e6337c73a -packaging==20.9 \ - --hash=sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5 \ - --hash=sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a -pep517==0.10.0 \ - --hash=sha256:eba39d201ef937584ad3343df3581069085bacc95454c80188291d5b3ac7a249 \ - --hash=sha256:ac59f3f6b9726a49e15a649474539442cf76e0697e39df4869d25e68e880931b -pyparsing==2.4.7 \ - --hash=sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1 \ - --hash=sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b -toml==0.10.2 \ - --hash=sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b \ - --hash=sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f -importlib-metadata==3.7.0 ; python_version<'3.8' \ - --hash=sha256:24499ffde1b80be08284100393955842be4a59c7c16bbf2738aad0e464a8e0aa \ - --hash=sha256:c6af5dbf1126cd959c4a8d8efd61d4d3c83bddb0459a17e554284a077574b614 -zipp==3.4.0 ; python_version<'3.8' \ - --hash=sha256:102c24ef8f171fd729d46599845e95c7ab894a4cf45f5de11a44cc7444fb1108 \ - --hash=sha256:ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb -typing-extensions==3.7.4.3 ; python_version<'3.8' \ - --hash=sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918 \ - --hash=sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c \ - --hash=sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f diff --git a/tools/ci_build/github/linux/docker/build_scripts/requirements3.10.txt b/tools/ci_build/github/linux/docker/build_scripts/requirements3.10.txt index ebbf23ffe28d2..8e70aa408c205 100644 --- a/tools/ci_build/github/linux/docker/build_scripts/requirements3.10.txt +++ b/tools/ci_build/github/linux/docker/build_scripts/requirements3.10.txt @@ -8,27 +8,27 @@ build==0.7.0 \ --hash=sha256:1aaadcd69338252ade4f7ec1265e1a19184bf916d84c9b7df095f423948cb89f \ --hash=sha256:21b7ebbd1b22499c4dac536abc7606696ea4d909fd755e00f09f3c0f2c05e3c8 # via -r requirements.in -packaging==21.2 \ - --hash=sha256:096d689d78ca690e4cd8a89568ba06d07ca097e3306a4381635073ca91479966 \ - --hash=sha256:14317396d1e8cdb122989b916fa2c7e9ca8e2be9e8060a6eff75b6b7b4d8a7e0 +packaging==21.3 \ + --hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \ + --hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522 # via build pep517==0.12.0 \ --hash=sha256:931378d93d11b298cf511dd634cf5ea4cb249a28ef84160b3247ee9afb4e8ab0 \ --hash=sha256:dd884c326898e2c6e11f9e0b64940606a93eb10ea022a2e067959f3a110cf161 # via build -pyparsing==2.4.7 \ - --hash=sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1 \ - --hash=sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b +pyparsing==3.0.7 \ + --hash=sha256:18ee9022775d270c55187733956460083db60b37d0d0fb357445f3094eed3eea \ + --hash=sha256:a6c06a88f252e6c322f65faf8f418b16213b51bdfaece0524c1c1bc30c63c484 # via packaging -tomli==1.2.2 \ - --hash=sha256:c6ce0015eb38820eaf32b5db832dbc26deb3dd427bd5f6556cf0acac2c214fee \ - --hash=sha256:f04066f68f5554911363063a30b108d2b5a5b1a010aa8b6132af78489fe3aade +tomli==2.0.0 \ + --hash=sha256:b5bde28da1fed24b9bd1d4d2b8cba62300bfb4ec9a6187a957e8ddb9434c5224 \ + --hash=sha256:c292c34f58502a1eb2bbb9f5bbc9a5ebc37bee10ffb8c2d6bbdfa8eb13cc14e1 # via # build # pep517 -wheel==0.37.0 \ - --hash=sha256:21014b2bd93c6d0034b6ba5d35e4eb284340e09d63c59aef6fc14b0f346146fd \ - --hash=sha256:e2ef7239991699e3355d54f8e968a21bb940a1dbf34a4d226741e64462516fad +wheel==0.37.1 \ + --hash=sha256:4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a \ + --hash=sha256:e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4 # via -r requirements.in # The following packages are considered to be unsafe in a requirements file: @@ -36,7 +36,7 @@ pip==21.3.1 \ --hash=sha256:deaf32dcd9ab821e359cd8330786bcd077604b5c5730c0b096eda46f95c24a2d \ --hash=sha256:fd11ba3d0fdb4c07fbc5ecbba0b1b719809420f25038f8ee3cd913d3faa3033a # via -r requirements.in -setuptools==58.5.3 \ - --hash=sha256:a481fbc56b33f5d8f6b33dce41482e64c68b668be44ff42922903b03872590bf \ - --hash=sha256:dae6b934a965c8a59d6d230d3867ec408bb95e73bd538ff77e71fedf1eaca729 +setuptools==60.5.0 \ + --hash=sha256:2404879cda71495fc4d5cbc445ed52fdaddf352b36e40be8dcc63147cb4edabe \ + --hash=sha256:68eb94073fc486091447fcb0501efd6560a0e5a1839ba249e5ff3c4c93f05f90 # via -r requirements.in diff --git a/tools/ci_build/github/linux/docker/build_scripts/requirements3.6.txt b/tools/ci_build/github/linux/docker/build_scripts/requirements3.6.txt index 913787738a150..58b96d5327fab 100644 --- a/tools/ci_build/github/linux/docker/build_scripts/requirements3.6.txt +++ b/tools/ci_build/github/linux/docker/build_scripts/requirements3.6.txt @@ -8,38 +8,37 @@ build==0.7.0 \ --hash=sha256:1aaadcd69338252ade4f7ec1265e1a19184bf916d84c9b7df095f423948cb89f \ --hash=sha256:21b7ebbd1b22499c4dac536abc7606696ea4d909fd755e00f09f3c0f2c05e3c8 # via -r requirements.in -importlib-metadata==4.8.1 \ - --hash=sha256:b618b6d2d5ffa2f16add5697cf57a46c76a56229b0ed1c438322e4e95645bd15 \ - --hash=sha256:f284b3e11256ad1e5d03ab86bb2ccd6f5339688ff17a4d797a0fe7df326f23b1 +importlib-metadata==4.8.3 \ + --hash=sha256:65a9576a5b2d58ca44d133c42a241905cc45e34d2c06fd5ba2bafa221e5d7b5e \ + --hash=sha256:766abffff765960fcc18003801f7044eb6755ffae4521c8e8ce8e83b9c9b0668 # via # build # pep517 -packaging==21.2 \ - --hash=sha256:096d689d78ca690e4cd8a89568ba06d07ca097e3306a4381635073ca91479966 \ - --hash=sha256:14317396d1e8cdb122989b916fa2c7e9ca8e2be9e8060a6eff75b6b7b4d8a7e0 +packaging==21.3 \ + --hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \ + --hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522 # via build pep517==0.12.0 \ --hash=sha256:931378d93d11b298cf511dd634cf5ea4cb249a28ef84160b3247ee9afb4e8ab0 \ --hash=sha256:dd884c326898e2c6e11f9e0b64940606a93eb10ea022a2e067959f3a110cf161 # via build -pyparsing==2.4.7 \ - --hash=sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1 \ - --hash=sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b +pyparsing==3.0.7 \ + --hash=sha256:18ee9022775d270c55187733956460083db60b37d0d0fb357445f3094eed3eea \ + --hash=sha256:a6c06a88f252e6c322f65faf8f418b16213b51bdfaece0524c1c1bc30c63c484 # via packaging -tomli==1.2.2 \ - --hash=sha256:c6ce0015eb38820eaf32b5db832dbc26deb3dd427bd5f6556cf0acac2c214fee \ - --hash=sha256:f04066f68f5554911363063a30b108d2b5a5b1a010aa8b6132af78489fe3aade +tomli==1.2.3 \ + --hash=sha256:05b6166bff487dc068d322585c7ea4ef78deed501cc124060e0f238e89a9231f \ + --hash=sha256:e3069e4be3ead9668e21cb9b074cd948f7b3113fd9c8bba083f48247aab8b11c # via # build # pep517 -typing-extensions==3.10.0.2 \ - --hash=sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e \ - --hash=sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7 \ - --hash=sha256:f1d25edafde516b146ecd0613dabcc61409817af4766fbbcfb8d1ad4ec441a34 +typing-extensions==4.0.1 \ + --hash=sha256:4ca091dea149f945ec56afb48dae714f21e8692ef22a395223bcd328961b6a0e \ + --hash=sha256:7f001e5ac290a0c0401508864c7ec868be4e701886d5b573a9528ed3973d9d3b # via importlib-metadata -wheel==0.37.0 \ - --hash=sha256:21014b2bd93c6d0034b6ba5d35e4eb284340e09d63c59aef6fc14b0f346146fd \ - --hash=sha256:e2ef7239991699e3355d54f8e968a21bb940a1dbf34a4d226741e64462516fad +wheel==0.37.1 \ + --hash=sha256:4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a \ + --hash=sha256:e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4 # via -r requirements.in zipp==3.6.0 \ --hash=sha256:71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832 \ @@ -53,7 +52,7 @@ pip==21.3.1 \ --hash=sha256:deaf32dcd9ab821e359cd8330786bcd077604b5c5730c0b096eda46f95c24a2d \ --hash=sha256:fd11ba3d0fdb4c07fbc5ecbba0b1b719809420f25038f8ee3cd913d3faa3033a # via -r requirements.in -setuptools==58.5.3 \ - --hash=sha256:a481fbc56b33f5d8f6b33dce41482e64c68b668be44ff42922903b03872590bf \ - --hash=sha256:dae6b934a965c8a59d6d230d3867ec408bb95e73bd538ff77e71fedf1eaca729 +setuptools==59.6.0 \ + --hash=sha256:22c7348c6d2976a52632c67f7ab0cdf40147db7789f9aed18734643fe9cf3373 \ + --hash=sha256:4ce92f1e1f8f01233ee9952c04f6b81d1e02939d6e1b488428154974a4d0783e # via -r requirements.in diff --git a/tools/ci_build/github/linux/docker/build_scripts/requirements3.7.txt b/tools/ci_build/github/linux/docker/build_scripts/requirements3.7.txt index a96cc122b1ef9..9a3324dcd073b 100644 --- a/tools/ci_build/github/linux/docker/build_scripts/requirements3.7.txt +++ b/tools/ci_build/github/linux/docker/build_scripts/requirements3.7.txt @@ -8,42 +8,41 @@ build==0.7.0 \ --hash=sha256:1aaadcd69338252ade4f7ec1265e1a19184bf916d84c9b7df095f423948cb89f \ --hash=sha256:21b7ebbd1b22499c4dac536abc7606696ea4d909fd755e00f09f3c0f2c05e3c8 # via -r requirements.in -importlib-metadata==4.8.1 \ - --hash=sha256:b618b6d2d5ffa2f16add5697cf57a46c76a56229b0ed1c438322e4e95645bd15 \ - --hash=sha256:f284b3e11256ad1e5d03ab86bb2ccd6f5339688ff17a4d797a0fe7df326f23b1 +importlib-metadata==4.10.1 \ + --hash=sha256:899e2a40a8c4a1aec681feef45733de8a6c58f3f6a0dbed2eb6574b4387a77b6 \ + --hash=sha256:951f0d8a5b7260e9db5e41d429285b5f451e928479f19d80818878527d36e95e # via # build # pep517 -packaging==21.2 \ - --hash=sha256:096d689d78ca690e4cd8a89568ba06d07ca097e3306a4381635073ca91479966 \ - --hash=sha256:14317396d1e8cdb122989b916fa2c7e9ca8e2be9e8060a6eff75b6b7b4d8a7e0 +packaging==21.3 \ + --hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \ + --hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522 # via build pep517==0.12.0 \ --hash=sha256:931378d93d11b298cf511dd634cf5ea4cb249a28ef84160b3247ee9afb4e8ab0 \ --hash=sha256:dd884c326898e2c6e11f9e0b64940606a93eb10ea022a2e067959f3a110cf161 # via build -pyparsing==2.4.7 \ - --hash=sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1 \ - --hash=sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b +pyparsing==3.0.7 \ + --hash=sha256:18ee9022775d270c55187733956460083db60b37d0d0fb357445f3094eed3eea \ + --hash=sha256:a6c06a88f252e6c322f65faf8f418b16213b51bdfaece0524c1c1bc30c63c484 # via packaging -tomli==1.2.2 \ - --hash=sha256:c6ce0015eb38820eaf32b5db832dbc26deb3dd427bd5f6556cf0acac2c214fee \ - --hash=sha256:f04066f68f5554911363063a30b108d2b5a5b1a010aa8b6132af78489fe3aade +tomli==2.0.0 \ + --hash=sha256:b5bde28da1fed24b9bd1d4d2b8cba62300bfb4ec9a6187a957e8ddb9434c5224 \ + --hash=sha256:c292c34f58502a1eb2bbb9f5bbc9a5ebc37bee10ffb8c2d6bbdfa8eb13cc14e1 # via # build # pep517 -typing-extensions==3.10.0.2 \ - --hash=sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e \ - --hash=sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7 \ - --hash=sha256:f1d25edafde516b146ecd0613dabcc61409817af4766fbbcfb8d1ad4ec441a34 +typing-extensions==4.0.1 \ + --hash=sha256:4ca091dea149f945ec56afb48dae714f21e8692ef22a395223bcd328961b6a0e \ + --hash=sha256:7f001e5ac290a0c0401508864c7ec868be4e701886d5b573a9528ed3973d9d3b # via importlib-metadata -wheel==0.37.0 \ - --hash=sha256:21014b2bd93c6d0034b6ba5d35e4eb284340e09d63c59aef6fc14b0f346146fd \ - --hash=sha256:e2ef7239991699e3355d54f8e968a21bb940a1dbf34a4d226741e64462516fad +wheel==0.37.1 \ + --hash=sha256:4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a \ + --hash=sha256:e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4 # via -r requirements.in -zipp==3.6.0 \ - --hash=sha256:71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832 \ - --hash=sha256:9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc +zipp==3.7.0 \ + --hash=sha256:9f50f446828eb9d45b267433fd3e9da8d801f614129124863f9c51ebceafb87d \ + --hash=sha256:b47250dd24f92b7dd6a0a8fc5244da14608f3ca90a5efcd37a3b1642fac9a375 # via # importlib-metadata # pep517 @@ -53,7 +52,7 @@ pip==21.3.1 \ --hash=sha256:deaf32dcd9ab821e359cd8330786bcd077604b5c5730c0b096eda46f95c24a2d \ --hash=sha256:fd11ba3d0fdb4c07fbc5ecbba0b1b719809420f25038f8ee3cd913d3faa3033a # via -r requirements.in -setuptools==58.5.3 \ - --hash=sha256:a481fbc56b33f5d8f6b33dce41482e64c68b668be44ff42922903b03872590bf \ - --hash=sha256:dae6b934a965c8a59d6d230d3867ec408bb95e73bd538ff77e71fedf1eaca729 +setuptools==60.5.0 \ + --hash=sha256:2404879cda71495fc4d5cbc445ed52fdaddf352b36e40be8dcc63147cb4edabe \ + --hash=sha256:68eb94073fc486091447fcb0501efd6560a0e5a1839ba249e5ff3c4c93f05f90 # via -r requirements.in diff --git a/tools/ci_build/github/linux/docker/build_scripts/requirements3.8.txt b/tools/ci_build/github/linux/docker/build_scripts/requirements3.8.txt index 8a8cda46d3b0c..59601e925d20d 100644 --- a/tools/ci_build/github/linux/docker/build_scripts/requirements3.8.txt +++ b/tools/ci_build/github/linux/docker/build_scripts/requirements3.8.txt @@ -8,27 +8,27 @@ build==0.7.0 \ --hash=sha256:1aaadcd69338252ade4f7ec1265e1a19184bf916d84c9b7df095f423948cb89f \ --hash=sha256:21b7ebbd1b22499c4dac536abc7606696ea4d909fd755e00f09f3c0f2c05e3c8 # via -r requirements.in -packaging==21.2 \ - --hash=sha256:096d689d78ca690e4cd8a89568ba06d07ca097e3306a4381635073ca91479966 \ - --hash=sha256:14317396d1e8cdb122989b916fa2c7e9ca8e2be9e8060a6eff75b6b7b4d8a7e0 +packaging==21.3 \ + --hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \ + --hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522 # via build pep517==0.12.0 \ --hash=sha256:931378d93d11b298cf511dd634cf5ea4cb249a28ef84160b3247ee9afb4e8ab0 \ --hash=sha256:dd884c326898e2c6e11f9e0b64940606a93eb10ea022a2e067959f3a110cf161 # via build -pyparsing==2.4.7 \ - --hash=sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1 \ - --hash=sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b +pyparsing==3.0.7 \ + --hash=sha256:18ee9022775d270c55187733956460083db60b37d0d0fb357445f3094eed3eea \ + --hash=sha256:a6c06a88f252e6c322f65faf8f418b16213b51bdfaece0524c1c1bc30c63c484 # via packaging -tomli==1.2.2 \ - --hash=sha256:c6ce0015eb38820eaf32b5db832dbc26deb3dd427bd5f6556cf0acac2c214fee \ - --hash=sha256:f04066f68f5554911363063a30b108d2b5a5b1a010aa8b6132af78489fe3aade +tomli==2.0.0 \ + --hash=sha256:b5bde28da1fed24b9bd1d4d2b8cba62300bfb4ec9a6187a957e8ddb9434c5224 \ + --hash=sha256:c292c34f58502a1eb2bbb9f5bbc9a5ebc37bee10ffb8c2d6bbdfa8eb13cc14e1 # via # build # pep517 -wheel==0.37.0 \ - --hash=sha256:21014b2bd93c6d0034b6ba5d35e4eb284340e09d63c59aef6fc14b0f346146fd \ - --hash=sha256:e2ef7239991699e3355d54f8e968a21bb940a1dbf34a4d226741e64462516fad +wheel==0.37.1 \ + --hash=sha256:4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a \ + --hash=sha256:e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4 # via -r requirements.in # The following packages are considered to be unsafe in a requirements file: @@ -36,7 +36,7 @@ pip==21.3.1 \ --hash=sha256:deaf32dcd9ab821e359cd8330786bcd077604b5c5730c0b096eda46f95c24a2d \ --hash=sha256:fd11ba3d0fdb4c07fbc5ecbba0b1b719809420f25038f8ee3cd913d3faa3033a # via -r requirements.in -setuptools==58.5.3 \ - --hash=sha256:a481fbc56b33f5d8f6b33dce41482e64c68b668be44ff42922903b03872590bf \ - --hash=sha256:dae6b934a965c8a59d6d230d3867ec408bb95e73bd538ff77e71fedf1eaca729 +setuptools==60.5.0 \ + --hash=sha256:2404879cda71495fc4d5cbc445ed52fdaddf352b36e40be8dcc63147cb4edabe \ + --hash=sha256:68eb94073fc486091447fcb0501efd6560a0e5a1839ba249e5ff3c4c93f05f90 # via -r requirements.in diff --git a/tools/ci_build/github/linux/docker/build_scripts/requirements3.9.txt b/tools/ci_build/github/linux/docker/build_scripts/requirements3.9.txt index e1c3679b8f86e..90f4398b4ee75 100644 --- a/tools/ci_build/github/linux/docker/build_scripts/requirements3.9.txt +++ b/tools/ci_build/github/linux/docker/build_scripts/requirements3.9.txt @@ -8,27 +8,27 @@ build==0.7.0 \ --hash=sha256:1aaadcd69338252ade4f7ec1265e1a19184bf916d84c9b7df095f423948cb89f \ --hash=sha256:21b7ebbd1b22499c4dac536abc7606696ea4d909fd755e00f09f3c0f2c05e3c8 # via -r requirements.in -packaging==21.2 \ - --hash=sha256:096d689d78ca690e4cd8a89568ba06d07ca097e3306a4381635073ca91479966 \ - --hash=sha256:14317396d1e8cdb122989b916fa2c7e9ca8e2be9e8060a6eff75b6b7b4d8a7e0 +packaging==21.3 \ + --hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \ + --hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522 # via build pep517==0.12.0 \ --hash=sha256:931378d93d11b298cf511dd634cf5ea4cb249a28ef84160b3247ee9afb4e8ab0 \ --hash=sha256:dd884c326898e2c6e11f9e0b64940606a93eb10ea022a2e067959f3a110cf161 # via build -pyparsing==2.4.7 \ - --hash=sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1 \ - --hash=sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b +pyparsing==3.0.7 \ + --hash=sha256:18ee9022775d270c55187733956460083db60b37d0d0fb357445f3094eed3eea \ + --hash=sha256:a6c06a88f252e6c322f65faf8f418b16213b51bdfaece0524c1c1bc30c63c484 # via packaging -tomli==1.2.2 \ - --hash=sha256:c6ce0015eb38820eaf32b5db832dbc26deb3dd427bd5f6556cf0acac2c214fee \ - --hash=sha256:f04066f68f5554911363063a30b108d2b5a5b1a010aa8b6132af78489fe3aade +tomli==2.0.0 \ + --hash=sha256:b5bde28da1fed24b9bd1d4d2b8cba62300bfb4ec9a6187a957e8ddb9434c5224 \ + --hash=sha256:c292c34f58502a1eb2bbb9f5bbc9a5ebc37bee10ffb8c2d6bbdfa8eb13cc14e1 # via # build # pep517 -wheel==0.37.0 \ - --hash=sha256:21014b2bd93c6d0034b6ba5d35e4eb284340e09d63c59aef6fc14b0f346146fd \ - --hash=sha256:e2ef7239991699e3355d54f8e968a21bb940a1dbf34a4d226741e64462516fad +wheel==0.37.1 \ + --hash=sha256:4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a \ + --hash=sha256:e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4 # via -r requirements.in # The following packages are considered to be unsafe in a requirements file: @@ -36,7 +36,7 @@ pip==21.3.1 \ --hash=sha256:deaf32dcd9ab821e359cd8330786bcd077604b5c5730c0b096eda46f95c24a2d \ --hash=sha256:fd11ba3d0fdb4c07fbc5ecbba0b1b719809420f25038f8ee3cd913d3faa3033a # via -r requirements.in -setuptools==58.5.3 \ - --hash=sha256:a481fbc56b33f5d8f6b33dce41482e64c68b668be44ff42922903b03872590bf \ - --hash=sha256:dae6b934a965c8a59d6d230d3867ec408bb95e73bd538ff77e71fedf1eaca729 +setuptools==60.5.0 \ + --hash=sha256:2404879cda71495fc4d5cbc445ed52fdaddf352b36e40be8dcc63147cb4edabe \ + --hash=sha256:68eb94073fc486091447fcb0501efd6560a0e5a1839ba249e5ff3c4c93f05f90 # via -r requirements.in