Skip to content

Pin pip consistently in one place across the targets, fix st2docs build #4957

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

Merged
arm4b merged 8 commits into from
May 23, 2020
Merged

Pin pip consistently in one place across the targets, fix st2docs build #4957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
af21697
Pin pip to 20.0.2 consistently across the targets
May 23, 2020
eaa329c
Debug virtualenv options under py2
May 23, 2020
13b024a
Try to update virtualenv to latest version
May 23, 2020
90ad566
Debug virtualenv options
May 23, 2020
e948398
Fix virtualenv installation
May 23, 2020
c1a6a38
Debug virtualenv options
May 23, 2020
617f4ce
Debug virtualenv options
May 23, 2020
027553a
Remove virtualenv installation
May 23, 2020
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
6 changes: 0 additions & 6 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,6 @@ cache:
# are updated so it's disabled
#- .tox/

before_install:
# If you update these versions, make sure you update the versions in the .st2client-install-check
# and the requirements targets in the Makefile to match
- pip install --upgrade "pip==20.0.2"
- sudo pip install --upgrade "virtualenv==16.6.0"
Copy link
Member Author

@arm4b arm4b May 23, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI pinning virtualenv here never really worked.

In Travis environment:

virtualenv --version

16.1.0

for py2 env

and

virtualenv --version

16.0.0

for py3 env

Copy link
Member Author

@arm4b arm4b May 23, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It turns out that's because different virtualenv binaries were created when we installed/upgraded it with sudo and used one without 🤦


install:
- ./scripts/travis/install-requirements.sh
# prep a travis-specific dev conf file that uses travis instead of stanley
Expand Down
20 changes: 7 additions & 13 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ COVERAGE_GLOBS := .coverage.unit.* .coverage.integration.* .coverage.mistral.*
COVERAGE_GLOBS_QUOTED := $(foreach glob,$(COVERAGE_GLOBS),'$(glob)')

REQUIREMENTS := test-requirements.txt requirements.txt
# Pin common pip version here across all the targets
# Note! Periodic maintenance pip upgrades are required to be up-to-date with the latest pip security fixes and updates
PIP_VERSION ?= 20.0.2
PIP_OPTIONS := $(ST2_PIP_OPTIONS)

ifndef PYLINT_CONCURRENCY
Expand Down Expand Up @@ -319,7 +322,7 @@ lint-api-spec: requirements .lint-api-spec
@echo
@echo "================== Lint API spec ===================="
@echo
. $(VIRTUALENV_DIR)/bin/activate; st2common/bin/st2-validate-api-spec --config-file conf/st2.dev.conf
. $(VIRTUALENV_DIR)/bin/activate; st2common/bin/st2-validate-api-spec --config-file conf/st2.dev.conf

.PHONY: generate-api-spec
generate-api-spec: requirements .generate-api-spec
Expand Down Expand Up @@ -379,10 +382,7 @@ flake8: requirements .flake8
touch $(VIRTUALENV_ST2CLIENT_DIR)/bin/activate
chmod +x $(VIRTUALENV_ST2CLIENT_DIR)/bin/activate

# If you update these versions, make sure you also update the versions in the
# requirements target and .travis.yml to match
# Make sure we use the latest version of pip
$(VIRTUALENV_ST2CLIENT_DIR)/bin/pip install --upgrade "pip==20.0.2"
$(VIRTUALENV_ST2CLIENT_DIR)/bin/pip install --upgrade "pip==$(PIP_VERSION)"
# NOTE We need to upgrade setuptools to avoid bug with dependency resolving in old versions
# Setuptools 42 added support for python_requires, which is used by the configparser package,
# which is required by the importlib-metadata package
Expand Down Expand Up @@ -505,7 +505,8 @@ distclean: clean

.PHONY: .requirements
.requirements: virtualenv
# Print out pip version so we can see what version was restored from the Travis cache
$(VIRTUALENV_DIR)/bin/pip install --upgrade "pip==$(PIP_VERSION)"
# Print out pip version
$(VIRTUALENV_DIR)/bin/pip --version
# Generate all requirements to support current CI pipeline.
$(VIRTUALENV_DIR)/bin/python scripts/fixate-requirements.py --skip=virtualenv,virtualenv-osx -s st2*/in-requirements.txt contrib/runners/*/in-requirements.txt -f fixed-requirements.txt -o requirements.txt
Expand All @@ -527,11 +528,6 @@ requirements: virtualenv .requirements .sdist-requirements install-runners
@echo
@echo "==================== requirements ===================="
@echo
# If you update these versions, make sure you also update the versions in the
# .st2client-install-check target and .travis.yml to match
# Make sure we use latest version of pip
$(VIRTUALENV_DIR)/bin/pip --version
$(VIRTUALENV_DIR)/bin/pip install --upgrade "pip==20.0.2"
# setuptools >= 41.0.1 is required for packs.install in dev envs
# setuptools >= 42 is required so setup.py install respects dependencies' python_requires
$(VIRTUALENV_DIR)/bin/pip install --upgrade "setuptools==44.1.0"
Expand Down Expand Up @@ -586,8 +582,6 @@ virtualenv:
@echo
@echo "==================== virtualenv ===================="
@echo
# Note: We pass --no-download flag to make sure version of pip which we install (9.0.1) is used
# instead of latest version being downloaded from PyPi
test -f $(VIRTUALENV_DIR)/bin/activate || virtualenv --python=$(PYTHON_VERSION) $(VIRTUALENV_DIR) --no-download

# Setup PYTHONPATH in bash activate script...
Expand Down