Skip to content

Commit 7f5dc3b

Browse files
committed
Update pinned pip version to match core st2
Core st2 has pip==20.0.2 pinned. Also, virtualenv is building the env with a much newer version of pip now. So, the CI is flapping back and forth between pip-9.0*, pip-20.0*, and pip-20.3* (the latest right now). st2 pinned version is here: https://github.com/StackStorm/st2/blob/v3.3/Makefile#L56
1 parent a56ff36 commit 7f5dc3b

3 files changed

Lines changed: 10 additions & 4 deletions

File tree

.circle/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ requirements: virtualenv .clone_st2_repo .install-runners
283283
@echo
284284
@echo "==================== requirements ===================="
285285
@echo
286-
. $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --upgrade "pip>=9.0,<9.1"
286+
. $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --upgrade "pip==20.0.2"
287287
. $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r $(CI_DIR)/.circle/requirements-dev.txt
288288
. $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r $(CI_DIR)/.circle/requirements-pack-tests.txt
289289

@@ -292,7 +292,7 @@ requirements-ci:
292292
@echo
293293
@echo "==================== requirements-ci ===================="
294294
@echo
295-
. $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --upgrade "pip>=9.0,<9.1"
295+
. $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --upgrade "pip==20.0.2"
296296
. $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r $(CI_DIR)/.circle/requirements-dev.txt
297297
. $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r $(CI_DIR)/.circle/requirements-pack-tests.txt
298298

.circle/dependencies

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,17 @@ sudo apt-get -y install libldap2-dev libsasl2-dev
3838
# Hit github's API to keep the PAT active (without failing if it's not)
3939
(GH_TOKEN=${MACHINE_PASSWORD} gh repo view | head -n2) || true
4040

41-
sudo pip install -U "pip>=9.0,<9.1" setuptools virtualenv
41+
# This should track the pinned version of pip in st2's Makefile
42+
PIP_DEP="pip==20.0.2"
43+
sudo pip install -U "${PIP_DEP}" setuptools virtualenv
4244

4345
virtualenv ~/virtualenv
4446
source ~/virtualenv/bin/activate
4547

48+
# virtualenv is updating pip. Revert back to our pinned version.
49+
pip install -U "${PIP_DEP}"
50+
pip --version
51+
4652
# Install StackStorm requirements
4753
echo "Installing StackStorm requirements from /tmp/st2/requirements.txt"
4854
~/virtualenv/bin/pip install -r "/tmp/st2/requirements.txt"

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
name: Download and Install Dependencies
2222
command: |
2323
git clone --depth 1 --single-branch --branch "${LINT_CONFIGS_BRANCH:-master}" https://github.com/StackStorm/lint-configs.git ~/ci/lint-configs
24-
sudo pip install -U "pip>=9.0,<9.1" setuptools virtualenv pyyaml
24+
sudo pip install -U "pip==20.0.2" setuptools virtualenv pyyaml
2525
virtualenv ~/virtualenv
2626
~/virtualenv/bin/pip install flake8 pylint pyyaml requests
2727
- save_cache:

0 commit comments

Comments
 (0)