Skip to content

Commit ca16100

Browse files
committed
pin pipx<1.5.0
Can't install with hashes with pipx 1.5.0, the workaround does not work anymore. upstream issue: pypa/pip#9243
1 parent e45ba0b commit ca16100

File tree

3 files changed

+7
-13
lines changed

3 files changed

+7
-13
lines changed

docker/build_scripts/finalize.sh

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,10 @@ MANYLINUX_INTERPRETERS_NO_CHECK=1 /usr/local/bin/manylinux-interpreters ensure "
2828

2929
# Create venv for auditwheel & certifi
3030
TOOLS_PATH=/opt/_internal/tools
31-
/opt/python/cp310-cp310/bin/python -m venv $TOOLS_PATH
32-
source $TOOLS_PATH/bin/activate
31+
/opt/python/cp310-cp310/bin/python -m venv --without-pip ${TOOLS_PATH}
3332

34-
# Install default packages
35-
pip install -U --require-hashes -r $MY_DIR/requirements3.10.txt
3633
# Install certifi and pipx
37-
pip install -U --require-hashes -r $MY_DIR/requirements-base-tools.txt
34+
/opt/python/cp310-cp310/bin/python -m pip --python ${TOOLS_PATH}/bin/python install -U --require-hashes -r ${MY_DIR}/requirements-base-tools.txt
3835

3936
# Make pipx available in PATH,
4037
# Make sure when root installs apps, they're also in the PATH
@@ -55,13 +52,10 @@ chmod 755 /usr/local/bin/pipx
5552
# (https://github.com/pypa/manylinux/issues/53)
5653
# And it's not clear how up-to-date that is anyway
5754
# So let's just use the same one pip and everyone uses
58-
ln -s $(python -c 'import certifi; print(certifi.where())') /opt/_internal/certs.pem
55+
ln -s $(${TOOLS_PATH}/bin/python -c 'import certifi; print(certifi.where())') /opt/_internal/certs.pem
5956
# If you modify this line you also have to modify the versions in the Dockerfiles:
6057
export SSL_CERT_FILE=/opt/_internal/certs.pem
6158

62-
# Deactivate the tools virtual environment
63-
deactivate
64-
6559
# install other tools with pipx
6660
pushd $MY_DIR/requirements-tools
6761
for TOOL_PATH in $(find . -type f); do

docker/build_scripts/requirements-base-tools.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ packaging==24.0 \
2020
--hash=sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5 \
2121
--hash=sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9
2222
# via pipx
23-
pipx==1.5.0 \
24-
--hash=sha256:2371af2b772954cdb5c1dbfa0170219e3d2c09d9ff9b18e975f65562eeb7ab0a \
25-
--hash=sha256:801a55a9d58004bb18a464f668508e79fbffc22deb6f07982832d3ce3ff3756d
23+
pipx==1.4.3 \
24+
--hash=sha256:aa25c7a7d455daed7597bb88c259389176680e2e7446fbdb6e6696cdd3a5090b \
25+
--hash=sha256:d214512bccc601b575de096ee84fde8797323717a20752c48f7a55cc1bf062fe
2626
# via -r requirements-base-tools.in
2727
platformdirs==4.2.0 \
2828
--hash=sha256:0614df2a2f37e1a662acbd8e2b25b92ccf8632929bc6d43467e17fe89c75e068 \

requirements-base-tools.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
certifi
2-
pipx
2+
pipx<1.5.0

0 commit comments

Comments
 (0)