From 834de8c82650039680625cb5dd8ce55c38cd63dc Mon Sep 17 00:00:00 2001 From: Marko Petric Date: Wed, 27 Jan 2021 18:02:30 +0100 Subject: [PATCH] Get get-pip.py from dirac server --- .gitlab-ci.yml | 4 ++-- diracos/scriptTemplates/build_python_module_tpl.sh | 2 +- diracos/scriptTemplates/fix_pip_requirements_versions_tpl.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ce3d83c..a7ad245 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -316,8 +316,8 @@ push_tag: GIT_STRATEGY: none image: cern/cc7-base before_script: - - curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py - - python get-pip.py + - curl -O -L https://diracos.web.cern.ch/diracos/bootstrap/get-pip.py + - python get-pip.py pip==20.2.4 - pip install -U requests python-dateutil pytz - yum install git less -y - eval `ssh-agent -s` diff --git a/diracos/scriptTemplates/build_python_module_tpl.sh b/diracos/scriptTemplates/build_python_module_tpl.sh index e4958a3..931a0e2 100644 --- a/diracos/scriptTemplates/build_python_module_tpl.sh +++ b/diracos/scriptTemplates/build_python_module_tpl.sh @@ -29,7 +29,7 @@ source $PIP_DIRAC/bin/activate echo "Installing newer pip in virtualenv" cd /tmp -curl -O -L https://bootstrap.pypa.io/get-pip.py +curl -O -L https://diracos.web.cern.ch/diracos/bootstrap/get-pip.py python get-pip.py pip==20.2.4 pip install -r /tmp/requirements.txt diff --git a/diracos/scriptTemplates/fix_pip_requirements_versions_tpl.sh b/diracos/scriptTemplates/fix_pip_requirements_versions_tpl.sh index dbe4fb4..bf7d35b 100644 --- a/diracos/scriptTemplates/fix_pip_requirements_versions_tpl.sh +++ b/diracos/scriptTemplates/fix_pip_requirements_versions_tpl.sh @@ -24,7 +24,7 @@ if [ ! -z "$PIP_BUILD_DEPENDENCIES" ]; then echo "Installing pip" cd /tmp - curl -O -L https://bootstrap.pypa.io/get-pip.py + curl -O -L https://diracos.web.cern.ch/diracos/bootstrap/get-pip.py python get-pip.py pip==20.2.4 echo "Installing pip-tools"