diff --git a/Makefile b/Makefile index e900c3ae9a..336b1b4024 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/st2common/bin/st2-run-pack-tests b/st2common/bin/st2-run-pack-tests index 5244b03272..bed2826760 100755 --- a/st2common/bin/st2-run-pack-tests +++ b/st2common/bin/st2-run-pack-tests @@ -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 diff --git a/st2common/tests/unit/test_dist_utils.py b/st2common/tests/unit/test_dist_utils.py index 9c24320c21..9cd2b1bcf8 100644 --- a/st2common/tests/unit/test_dist_utils.py +++ b/st2common/tests/unit/test_dist_utils.py @@ -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' @@ -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)