From e45ba0b6fbffed5cd7625813e45034f609c421aa Mon Sep 17 00:00:00 2001 From: "manylinux-bot[bot]" <89297709+manylinux-bot[bot]@users.noreply.github.com> Date: Sun, 31 Mar 2024 18:03:39 +0000 Subject: [PATCH 1/2] Update python dependencies --- .../build_scripts/requirements-base-tools.txt | 6 ++-- docker/build_scripts/requirements-tools/cmake | 36 +++++++++---------- docker/build_scripts/requirements3.10.txt | 6 ++-- docker/build_scripts/requirements3.11.txt | 6 ++-- docker/build_scripts/requirements3.12.txt | 6 ++-- docker/build_scripts/requirements3.8.txt | 6 ++-- docker/build_scripts/requirements3.9.txt | 6 ++-- 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/docker/build_scripts/requirements-base-tools.txt b/docker/build_scripts/requirements-base-tools.txt index 08a5e976..1a1727ca 100644 --- a/docker/build_scripts/requirements-base-tools.txt +++ b/docker/build_scripts/requirements-base-tools.txt @@ -20,9 +20,9 @@ packaging==24.0 \ --hash=sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5 \ --hash=sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9 # via pipx -pipx==1.4.3 \ - --hash=sha256:aa25c7a7d455daed7597bb88c259389176680e2e7446fbdb6e6696cdd3a5090b \ - --hash=sha256:d214512bccc601b575de096ee84fde8797323717a20752c48f7a55cc1bf062fe +pipx==1.5.0 \ + --hash=sha256:2371af2b772954cdb5c1dbfa0170219e3d2c09d9ff9b18e975f65562eeb7ab0a \ + --hash=sha256:801a55a9d58004bb18a464f668508e79fbffc22deb6f07982832d3ce3ff3756d # via -r requirements-base-tools.in platformdirs==4.2.0 \ --hash=sha256:0614df2a2f37e1a662acbd8e2b25b92ccf8632929bc6d43467e17fe89c75e068 \ diff --git a/docker/build_scripts/requirements-tools/cmake b/docker/build_scripts/requirements-tools/cmake index b7797210..606c839f 100644 --- a/docker/build_scripts/requirements-tools/cmake +++ b/docker/build_scripts/requirements-tools/cmake @@ -4,22 +4,22 @@ # # nox -s update_python_tools # -cmake==3.28.4 \ - --hash=sha256:0c615eba2dc0381675351ccff1485249afb3b3ca3735b6af1b74fef5ef446d1c \ - --hash=sha256:213633f9e11c46dccc955169c4b1bac1775c1c9bfca99e393a7bd97bec3b5d11 \ - --hash=sha256:58e8de07e5f1b6dae1b211ce6c7ddfa0aa2fac30676947902c31919c74d765f3 \ - --hash=sha256:58f065208ed5351314d3accc5bcf88d63d6fad2be933fd364a13abdc6398e832 \ - --hash=sha256:70e606a33cd4daba2a4ff132bf0358ebeb5f5595bba9ff24023c112604f64d81 \ - --hash=sha256:7b874b94776d25d4c4a09b1006755c18a3ed74dc43ec887fa83a1b0e22c87c5d \ - --hash=sha256:802a18564b27728b1251e39eebd8e414dda7c6f220848755d4402cfe8c85c181 \ - --hash=sha256:83c7c569ce4c4a6bc57d2f2512c3ce3232a28aaf9ef1f95200368cf1e417c311 \ - --hash=sha256:8c3a0284763c1a7cd5abbcb4bdd49c2489fe61c92e995cb963bb70eccaa5d4f9 \ - --hash=sha256:8df18932454a0c10bc4255b71015b0cb46cb5ff815dfa7559580c0fa34d4c7bb \ - --hash=sha256:a140a6b22fcf8c126932a358b554ee7ee780018153f55cdd8014f7bf970c2dba \ - --hash=sha256:b45bc5d881727a6319d7f4b2b44e68e479ac76f18923a8eb551eb3869f2fe82a \ - --hash=sha256:b9dd1010ebe951e1acce054c295d5f891a8ae12b295d158b66020c955ae861b4 \ - --hash=sha256:bc06b483cb2bcaf78184e66ac7fd0f3bbe4ed9a690369b1e4897b19568d566dd \ - --hash=sha256:c21d79c77f83e506f0858bbe01ac4326d3014c8c0079388bd459b905d2acd30f \ - --hash=sha256:d642ee5e0f8e7252c75968bae3a1729dbbff6965f9dfb76d2f1611c583de14fd \ - --hash=sha256:f1b1bde70f6467aa7f20c110ca35a80256509311c57e487c2d195c4ea0aed08b +cmake==3.29.0.1 \ + --hash=sha256:068a3e7461dd9e487f5f3f720ae8072c2eeb37239ebe4642c4ae29058d83347f \ + --hash=sha256:1808071047cb49ed0fe2359e4c310b49880c2805cad4ea9f03c959f51b881ac7 \ + --hash=sha256:22493049b6383ea2baa7237a326c2914ab4a7b3e1642f4233245e3a34aae39f6 \ + --hash=sha256:2a8f7c8b07e6ab0dd444c5b74e658d5013ca0da456041029f734d751090bb7ec \ + --hash=sha256:58879ef15dd8344e1583a36cead794fb0fee13f78c590a56749283ac2e27d30a \ + --hash=sha256:7bb8aaa3419eafd466931e4dcc161d3e5e6a82730ab508c75946ff4fc883b3f6 \ + --hash=sha256:85a0e28eaaee311d50fcee60f730e5a44a65b3cefc556a1163bbabd7328acd60 \ + --hash=sha256:a36f3b19a5caa6c63aa70bfa0b262bae8d296e68c6e6d8e918edc5c51d952bf8 \ + --hash=sha256:c097892b3653e2d2d41d055c80a9af029fdd24f9eff2ecb66576e4da8b85b1c7 \ + --hash=sha256:c85e35ec572e54152154637f24d6bde316fbcf94dfea644bd8f22b1855a09abe \ + --hash=sha256:d09573411901fc8a3ede7433713c000ac7b81cda0d771874e9182770acf29eb4 \ + --hash=sha256:de8f55198f4a820daf2c57645a4bb8cd1064dc92d950ad95be14c5ffabc15bd4 \ + --hash=sha256:e956e4b6c2d8d6bbee399bf3c77e5b901d916fe8f35d6b2f58444d5892c4602b \ + --hash=sha256:ead7dc5176a6c6347b3fc19532c25ec328f9279b6213902ac930242334e7b621 \ + --hash=sha256:ec49a7a4480959c229d9d2aa77f7885859c17a45fc66981aaf4551ceffb4d030 \ + --hash=sha256:ec8b39fdeb75c48fd5a2894658a1ca75f94fb49b421c1f753d86d3e5d5e9f196 \ + --hash=sha256:f7c7dabf3dd40cb830d2eded43d51c5a3737625bbc5ab6916041c04e352b74f8 # via -r .nox/update_python_tools/tmp/cmake.in diff --git a/docker/build_scripts/requirements3.10.txt b/docker/build_scripts/requirements3.10.txt index e75744a0..460c0864 100644 --- a/docker/build_scripts/requirements3.10.txt +++ b/docker/build_scripts/requirements3.10.txt @@ -4,9 +4,9 @@ # # nox -s update_python_dependencies-3.10 # -build==1.1.1 \ - --hash=sha256:8ed0851ee76e6e38adce47e4bee3b51c771d86c64cf578d0c2245567ee200e73 \ - --hash=sha256:8eea65bb45b1aac2e734ba2cc8dad3a6d97d97901a395bd0ed3e7b46953d2a31 +build==1.2.1 \ + --hash=sha256:526263f4870c26f26c433545579475377b2b7588b6f1eac76a001e873ae3e19d \ + --hash=sha256:75e10f767a433d9a86e50d83f418e83efc18ede923ee5ff7df93b6cb0306c5d4 # via -r requirements.in packaging==24.0 \ --hash=sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5 \ diff --git a/docker/build_scripts/requirements3.11.txt b/docker/build_scripts/requirements3.11.txt index e125224c..06791804 100644 --- a/docker/build_scripts/requirements3.11.txt +++ b/docker/build_scripts/requirements3.11.txt @@ -4,9 +4,9 @@ # # nox -s update_python_dependencies-3.11 # -build==1.1.1 \ - --hash=sha256:8ed0851ee76e6e38adce47e4bee3b51c771d86c64cf578d0c2245567ee200e73 \ - --hash=sha256:8eea65bb45b1aac2e734ba2cc8dad3a6d97d97901a395bd0ed3e7b46953d2a31 +build==1.2.1 \ + --hash=sha256:526263f4870c26f26c433545579475377b2b7588b6f1eac76a001e873ae3e19d \ + --hash=sha256:75e10f767a433d9a86e50d83f418e83efc18ede923ee5ff7df93b6cb0306c5d4 # via -r requirements.in packaging==24.0 \ --hash=sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5 \ diff --git a/docker/build_scripts/requirements3.12.txt b/docker/build_scripts/requirements3.12.txt index 2bbf844c..69635430 100644 --- a/docker/build_scripts/requirements3.12.txt +++ b/docker/build_scripts/requirements3.12.txt @@ -4,9 +4,9 @@ # # nox -s update_python_dependencies-3.12 # -build==1.1.1 \ - --hash=sha256:8ed0851ee76e6e38adce47e4bee3b51c771d86c64cf578d0c2245567ee200e73 \ - --hash=sha256:8eea65bb45b1aac2e734ba2cc8dad3a6d97d97901a395bd0ed3e7b46953d2a31 +build==1.2.1 \ + --hash=sha256:526263f4870c26f26c433545579475377b2b7588b6f1eac76a001e873ae3e19d \ + --hash=sha256:75e10f767a433d9a86e50d83f418e83efc18ede923ee5ff7df93b6cb0306c5d4 # via -r requirements.in packaging==24.0 \ --hash=sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5 \ diff --git a/docker/build_scripts/requirements3.8.txt b/docker/build_scripts/requirements3.8.txt index 8457eea3..7542c723 100644 --- a/docker/build_scripts/requirements3.8.txt +++ b/docker/build_scripts/requirements3.8.txt @@ -4,9 +4,9 @@ # # nox -s update_python_dependencies-3.8 # -build==1.1.1 \ - --hash=sha256:8ed0851ee76e6e38adce47e4bee3b51c771d86c64cf578d0c2245567ee200e73 \ - --hash=sha256:8eea65bb45b1aac2e734ba2cc8dad3a6d97d97901a395bd0ed3e7b46953d2a31 +build==1.2.1 \ + --hash=sha256:526263f4870c26f26c433545579475377b2b7588b6f1eac76a001e873ae3e19d \ + --hash=sha256:75e10f767a433d9a86e50d83f418e83efc18ede923ee5ff7df93b6cb0306c5d4 # via -r requirements.in importlib-metadata==7.1.0 \ --hash=sha256:30962b96c0c223483ed6cc7280e7f0199feb01a0e40cfae4d4450fc6fab1f570 \ diff --git a/docker/build_scripts/requirements3.9.txt b/docker/build_scripts/requirements3.9.txt index 1cbeb1e0..47d6786b 100644 --- a/docker/build_scripts/requirements3.9.txt +++ b/docker/build_scripts/requirements3.9.txt @@ -4,9 +4,9 @@ # # nox -s update_python_dependencies-3.9 # -build==1.1.1 \ - --hash=sha256:8ed0851ee76e6e38adce47e4bee3b51c771d86c64cf578d0c2245567ee200e73 \ - --hash=sha256:8eea65bb45b1aac2e734ba2cc8dad3a6d97d97901a395bd0ed3e7b46953d2a31 +build==1.2.1 \ + --hash=sha256:526263f4870c26f26c433545579475377b2b7588b6f1eac76a001e873ae3e19d \ + --hash=sha256:75e10f767a433d9a86e50d83f418e83efc18ede923ee5ff7df93b6cb0306c5d4 # via -r requirements.in importlib-metadata==7.1.0 \ --hash=sha256:30962b96c0c223483ed6cc7280e7f0199feb01a0e40cfae4d4450fc6fab1f570 \ From ca161006da59fa513e8c1d36b98b7eb0cc4bf8d9 Mon Sep 17 00:00:00 2001 From: mayeut Date: Mon, 1 Apr 2024 11:45:39 +0200 Subject: [PATCH 2/2] pin pipx<1.5.0 Can't install with hashes with pipx 1.5.0, the workaround does not work anymore. upstream issue: https://github.com/pypa/pip/issues/9243 --- docker/build_scripts/finalize.sh | 12 +++--------- docker/build_scripts/requirements-base-tools.txt | 6 +++--- requirements-base-tools.in | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/docker/build_scripts/finalize.sh b/docker/build_scripts/finalize.sh index 881f7ac0..88908ee7 100755 --- a/docker/build_scripts/finalize.sh +++ b/docker/build_scripts/finalize.sh @@ -28,13 +28,10 @@ MANYLINUX_INTERPRETERS_NO_CHECK=1 /usr/local/bin/manylinux-interpreters ensure " # Create venv for auditwheel & certifi TOOLS_PATH=/opt/_internal/tools -/opt/python/cp310-cp310/bin/python -m venv $TOOLS_PATH -source $TOOLS_PATH/bin/activate +/opt/python/cp310-cp310/bin/python -m venv --without-pip ${TOOLS_PATH} -# Install default packages -pip install -U --require-hashes -r $MY_DIR/requirements3.10.txt # Install certifi and pipx -pip install -U --require-hashes -r $MY_DIR/requirements-base-tools.txt +/opt/python/cp310-cp310/bin/python -m pip --python ${TOOLS_PATH}/bin/python install -U --require-hashes -r ${MY_DIR}/requirements-base-tools.txt # Make pipx available in PATH, # Make sure when root installs apps, they're also in the PATH @@ -55,13 +52,10 @@ chmod 755 /usr/local/bin/pipx # (https://github.com/pypa/manylinux/issues/53) # And it's not clear how up-to-date that is anyway # So let's just use the same one pip and everyone uses -ln -s $(python -c 'import certifi; print(certifi.where())') /opt/_internal/certs.pem +ln -s $(${TOOLS_PATH}/bin/python -c 'import certifi; print(certifi.where())') /opt/_internal/certs.pem # If you modify this line you also have to modify the versions in the Dockerfiles: export SSL_CERT_FILE=/opt/_internal/certs.pem -# Deactivate the tools virtual environment -deactivate - # install other tools with pipx pushd $MY_DIR/requirements-tools for TOOL_PATH in $(find . -type f); do diff --git a/docker/build_scripts/requirements-base-tools.txt b/docker/build_scripts/requirements-base-tools.txt index 1a1727ca..08a5e976 100644 --- a/docker/build_scripts/requirements-base-tools.txt +++ b/docker/build_scripts/requirements-base-tools.txt @@ -20,9 +20,9 @@ packaging==24.0 \ --hash=sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5 \ --hash=sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9 # via pipx -pipx==1.5.0 \ - --hash=sha256:2371af2b772954cdb5c1dbfa0170219e3d2c09d9ff9b18e975f65562eeb7ab0a \ - --hash=sha256:801a55a9d58004bb18a464f668508e79fbffc22deb6f07982832d3ce3ff3756d +pipx==1.4.3 \ + --hash=sha256:aa25c7a7d455daed7597bb88c259389176680e2e7446fbdb6e6696cdd3a5090b \ + --hash=sha256:d214512bccc601b575de096ee84fde8797323717a20752c48f7a55cc1bf062fe # via -r requirements-base-tools.in platformdirs==4.2.0 \ --hash=sha256:0614df2a2f37e1a662acbd8e2b25b92ccf8632929bc6d43467e17fe89c75e068 \ diff --git a/requirements-base-tools.in b/requirements-base-tools.in index 569cc4c7..97c6351d 100644 --- a/requirements-base-tools.in +++ b/requirements-base-tools.in @@ -1,2 +1,2 @@ certifi -pipx +pipx<1.5.0