Skip to content

Commit

Permalink
pin pipx<1.5.0
Browse files Browse the repository at this point in the history
Can't install with hashes with pipx 1.5.0, the workaround does not work anymore.
upstream issue: pypa/pip#9243
  • Loading branch information
mayeut committed Apr 1, 2024
1 parent e45ba0b commit ca16100
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 13 deletions.
12 changes: 3 additions & 9 deletions docker/build_scripts/finalize.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions docker/build_scripts/requirements-base-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion requirements-base-tools.in
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
certifi
pipx
pipx<1.5.0

0 comments on commit ca16100

Please sign in to comment.