Skip to content

Pinning pip to 20.0.2 to fix build issues introduced in pip 20.1 #4929

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 3 commits into from
May 1, 2020
Merged

Pinning pip to 20.0.2 to fix build issues introduced in pip 20.1 #4929

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
ed2b90f
Pinning pip to 20.0.2 to fix build issues introduced in pip 20.1
nmaludy Apr 29, 2020
dceab27
Merge remote-tracking branch 'origin/master' into hotfix/pin-pip-setu…
nmaludy Apr 29, 2020
3b0c47a
Fixing unit test that was invoking old fetch_requirements from old di…
nmaludy Apr 29, 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
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,10 +519,10 @@ requirements: virtualenv .requirements .sdist-requirements install-runners
# .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>=19.3.1"
$(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>=42"
$(VIRTUALENV_DIR)/bin/pip install --upgrade "setuptools==44.1.0"
$(VIRTUALENV_DIR)/bin/pip install --upgrade "pbr==5.4.3" # workaround for pbr issue

# Fix for Travis CI race
Expand Down
2 changes: 1 addition & 1 deletion st2common/bin/st2-run-pack-tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ if [ "${CREATE_VIRTUALENV}" = true ]; then
activate_virtualenv

# Make sure virtualenv is using latest pip version
${VIRTUALENV_DIR}/bin/pip install --upgrade "pip>=19.0.1,<20.0"
${VIRTUALENV_DIR}/bin/pip install --upgrade "pip==20.0.2"
fi

if [ ! -d "${VIRTUALENV_DIR}" ]; then
Expand Down
16 changes: 2 additions & 14 deletions st2common/tests/unit/test_dist_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
from dist_utils import fetch_requirements
from dist_utils import apply_vagrant_workaround
from dist_utils import get_version_string
from dist_utils_old import fetch_requirements as old_fetch_requirements

__all__ = [
'DistUtilsTestCase'
Expand Down Expand Up @@ -138,18 +137,7 @@ def test_fetch_requirements(self):
self.assertEqual(reqs, expected_reqs)
self.assertEqual(links, expected_links)

# Verify output of old and new function is the same
reqs_old, links_old = old_fetch_requirements(REQUIREMENTS_PATH_1)

self.assertEqual(reqs_old, expected_reqs)
self.assertEqual(links_old, expected_links)

self.assertEqual(reqs_old, reqs)
self.assertEqual(links_old, links)

# Also test it on requirements.txt in repo root
reqs, links = fetch_requirements(REQUIREMENTS_PATH_2)
reqs_old, links_old = old_fetch_requirements(REQUIREMENTS_PATH_2)

self.assertEqual(reqs_old, reqs)
self.assertEqual(links_old, links)
self.assertGreater(len(reqs), 0)
self.assertGreater(len(links), 0)