From 34e2307fce4ce6de7982f4adee0ab5b95acb2d13 Mon Sep 17 00:00:00 2001 From: Philippe MILINK Date: Sun, 27 Oct 2024 15:47:23 +0100 Subject: [PATCH] =?UTF-8?q?G=C3=A8le=20la=20version=20de=20pip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reste à 24.2 tant que https://github.com/pypa/pip/issues/13046 n'est pas corrigé. --- .github/workflows/ci.yml | 6 +++--- scripts/define_variable.sh | 4 ++++ scripts/install_zds.sh | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 91951fd6d0..f4f1509200 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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 @@ -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 diff --git a/scripts/define_variable.sh b/scripts/define_variable.sh index 6286b37c35..861cc1e4ee 100644 --- a/scripts/define_variable.sh +++ b/scripts/define_variable.sh @@ -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 diff --git a/scripts/install_zds.sh b/scripts/install_zds.sh index a778ff8e18..703fa86343 100755 --- a/scripts/install_zds.sh +++ b/scripts/install_zds.sh @@ -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"