Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUGFIX] Pin the same pip version as core st2 #102

Merged
merged 3 commits into from
Mar 6, 2021
Merged

[BUGFIX] Pin the same pip version as core st2 #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f5dc3b
Update pinned pip version to match core st2
cognifloyd Jan 28, 2021
b535731
use virtualenv flag to use pinned pip
cognifloyd Jan 28, 2021
a2ea4ae
Add comment about where to update the PIP_VERSION
cognifloyd Feb 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circle/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ requirements: virtualenv .clone_st2_repo .install-runners
@echo
@echo "==================== requirements ===================="
@echo
. $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --upgrade "pip>=9.0,<9.1"
. $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --upgrade "pip==20.0.2"
. $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r $(CI_DIR)/.circle/requirements-dev.txt
. $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r $(CI_DIR)/.circle/requirements-pack-tests.txt

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

Expand Down
7 changes: 5 additions & 2 deletions .circle/dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,12 @@ sudo apt-get -y install libldap2-dev libsasl2-dev
# Hit github's API to keep the PAT active (without failing if it's not)
(GH_TOKEN=${MACHINE_PASSWORD} gh repo view | head -n2) || true

sudo pip install -U "pip>=9.0,<9.1" setuptools virtualenv
# This should track the pinned version of pip in st2's Makefile
# Please sync this version with .circle/Makefile and .circleci/config.yml
PIP_VERSION="20.0.2"

virtualenv ~/virtualenv
sudo pip install -U "pip==${PIP_VERSION}" setuptools virtualenv
virtualenv --pip "${PIP_VERSION}" ~/virtualenv
source ~/virtualenv/bin/activate

# Install StackStorm requirements
Expand Down
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
name: Download and Install Dependencies
command: |
git clone --depth 1 --single-branch --branch "${LINT_CONFIGS_BRANCH:-master}" https://github.com/StackStorm/lint-configs.git ~/ci/lint-configs
sudo pip install -U "pip>=9.0,<9.1" setuptools virtualenv pyyaml
sudo pip install -U "pip==20.0.2" setuptools virtualenv pyyaml
virtualenv ~/virtualenv
~/virtualenv/bin/pip install flake8 pylint pyyaml requests
- save_cache:
Expand Down