Skip to content

Commit

Permalink
Gèle la version de pip
Browse files Browse the repository at this point in the history
Reste à 24.2 tant que pypa/pip#13046 n'est pas
corrigé.
  • Loading branch information
philippemilink authored and Situphen committed Oct 27, 2024
1 parent c0cef18 commit 34e2307
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
env:
NODE_VERSION: "18" # needs to be also updated in .nvmrc
PYTHON_VERSION: "3.11"
PIP_VERSION: "24.2" # stick to it while https://github.com/pypa/pip/issues/13046 is not fixed, needs to be also updated in scripts/define_variable.sh
MARIADB_VERSION: "10.4.10"
COVERALLS_VERSION: "3.3.1" # check if Coverage needs to be also updated in requirements-ci.txt
TYPESENSE_VERSION: "27.0" # needs to be also updated in scripts/define_variable.sh
Expand Down Expand Up @@ -59,7 +60,7 @@ jobs:
python-version: "${{ env.PYTHON_VERSION }}"

- name: Upgrade pip
run: pip install --upgrade pip
run: pip install pip==${{ env.PIP_VERSION }}

- name: Retrieve pip cache directory
id: pip-cache
Expand Down Expand Up @@ -188,8 +189,7 @@ jobs:
python-version: "${{ env.PYTHON_VERSION }}"

- name: Upgrade pip
run: |
pip install --upgrade pip
run: pip install pip==${{ env.PIP_VERSION }}

- name: Retrieve pip cache directory
id: pip-cache
Expand Down
4 changes: 4 additions & 0 deletions scripts/define_variable.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ if [[ $ZDS_VENV_VERSION == "" ]]; then
ZDS_VENV_VERSION="20.24.5"
fi

if [[ $ZDS_PIP_VERSION == "" ]]; then
ZDS_PIP_VERSION="24.2" # stick to it while https://github.com/pypa/pip/issues/13046 is not fixed, needs to be also updated in .github/workflows/ci.yml
fi

ZDS_NODE_VERSION=$(cat $ZDSSITE_DIR/.nvmrc)

if [[ $ZDS_NVM_VERSION == "" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion scripts/install_zds.sh
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ if ! $(_in "--force-skip-activating" $@) && [[ ( $VIRTUAL_ENV == "" || $(realpat

# Some dependencies (like rust ones) require a recent pip:
print_info "* upgrading pip"
pip install --upgrade pip; exVal=$?
pip install pip==$ZDS_PIP_VERSION; exVal=$?

if [[ $exVal != 0 ]]; then
print_error "!! Failed to upgrade pip"
Expand Down

0 comments on commit 34e2307

Please sign in to comment.