From 249b07844c29d1b7b5d48d2e4a72e1ec98b0ce65 Mon Sep 17 00:00:00 2001 From: Stavros Kroustouris Date: Thu, 26 Nov 2020 15:42:22 +0100 Subject: [PATCH 1/5] issue 5060 upgrade virtualenv to latest (20.2.1) --- CHANGELOG.rst | 5 +++-- fixed-requirements.txt | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 570da68297..7399f14441 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -25,11 +25,13 @@ Changed * Added timeout parameter for packs.install action to help with long running installs that exceed the default timeout of 600 sec which is defined by the python_script action runner (improvement) #5084 - Contributed by @hnanchahal * Upgraded cryptography version to 3.2 to avoid CVE-2020-25659 (security) #5095 +* Upgrade virtualenv version to latest - 20.2.2 (improvement) #5094 + Contributed by @kroustou + Fixed ~~~~~~~~~ * Pin chardet version as newest version was incompatible with pinned requests version #5101 @@ -41,7 +43,6 @@ Fixed * Added monkey patch fix to st2stream to enable it to work with mongodb via SSL. (bug fix) #5078 #5091 * Fix nginx buffering long polling stream to client. Instead of waiting for closed connection wait for final event to be sent to client. (bug fix) #4842 #5042 - Contributed by @guzzijones * StackStorm now explicitly decodes pack files as utf-8 instead of implicitly as ascii (bug fix) #5106, #5107 diff --git a/fixed-requirements.txt b/fixed-requirements.txt index 3804f1d34f..4deb5f4d76 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -46,8 +46,8 @@ six==1.13.0 sseclient-py==1.7 stevedore==1.30.1 tooz==1.66.1 -# Note: We use latest version of virtualenv which uses pip 19 -virtualenv==16.6.0 +# Note: We use latest version of virtualenv which uses pip 20.3.3, wheel 0.35.1 and setuptools 44.1.1 +virtualenv==20.2.2 webob==1.8.5 zake==0.2.2 # test requirements below From c045750dd5b118c96f7562215be00709b2ebbd78 Mon Sep 17 00:00:00 2001 From: Stavros Kroustouris Date: Sun, 13 Dec 2020 13:53:35 +0100 Subject: [PATCH 2/5] Update based on review comments --- Makefile | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Makefile b/Makefile index 49e75ab8c1..b0aaddec9d 100644 --- a/Makefile +++ b/Makefile @@ -392,12 +392,6 @@ flake8: requirements .flake8 touch $(VIRTUALENV_ST2CLIENT_DIR)/bin/activate chmod +x $(VIRTUALENV_ST2CLIENT_DIR)/bin/activate - # 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 - $(VIRTUALENV_ST2CLIENT_DIR)/bin/pip install --upgrade "pip==$(PIP_VERSION)" - $(VIRTUALENV_ST2CLIENT_DIR)/bin/pip install --upgrade "setuptools==44.1.0" - $(VIRTUALENV_ST2CLIENT_DIR)/bin/activate; cd st2client ; ../$(VIRTUALENV_ST2CLIENT_DIR)/bin/python setup.py install ; cd .. $(VIRTUALENV_ST2CLIENT_DIR)/bin/st2 --version $(VIRTUALENV_ST2CLIENT_DIR)/bin/python -c "import st2client" @@ -523,9 +517,6 @@ requirements: virtualenv .requirements .sdist-requirements install-runners insta @echo @echo "==================== requirements ====================" @echo - # 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" $(VIRTUALENV_DIR)/bin/pip install --upgrade "pbr==5.4.3" # workaround for pbr issue # Fix for Travis CI race From 5bda33c034111005957a1395023e0c78f802a459 Mon Sep 17 00:00:00 2001 From: Amanda McGuinness Date: Sat, 23 Jan 2021 23:05:09 +0000 Subject: [PATCH 3/5] Update to resolve conflicts --- Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile b/Makefile index c43dcf3119..d90327f67a 100644 --- a/Makefile +++ b/Makefile @@ -394,9 +394,6 @@ flake8: requirements .flake8 touch $(VIRTUALENV_ST2CLIENT_DIR)/bin/activate chmod +x $(VIRTUALENV_ST2CLIENT_DIR)/bin/activate - $(VIRTUALENV_ST2CLIENT_DIR)/bin/pip install --upgrade "pip==$(PIP_VERSION)" - - $(VIRTUALENV_ST2CLIENT_DIR)/bin/activate; cd st2client ; ../$(VIRTUALENV_ST2CLIENT_DIR)/bin/python setup.py install ; cd .. $(VIRTUALENV_ST2CLIENT_DIR)/bin/st2 --version $(VIRTUALENV_ST2CLIENT_DIR)/bin/python -c "import st2client" From 791dc5f4add67fc431d05bc4e340e8804af07bae Mon Sep 17 00:00:00 2001 From: Amanda McGuinness Date: Sat, 23 Jan 2021 23:14:14 +0000 Subject: [PATCH 4/5] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d90327f67a..b25d938a43 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ 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.3.3 +PIP_VERSION ?= 20.0.2 PIP_OPTIONS := $(ST2_PIP_OPTIONS) ifndef PYLINT_CONCURRENCY From 91a53a83c4eb4bf9b31eb6b85fa0525857094413 Mon Sep 17 00:00:00 2001 From: Amanda McGuinness Date: Sun, 24 Jan 2021 11:49:01 +0000 Subject: [PATCH 5/5] Update Makefile Remove commented out line to trigger a new Travis run. --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index b25d938a43..b864f59cd9 100644 --- a/Makefile +++ b/Makefile @@ -527,7 +527,6 @@ requirements: virtualenv .requirements .sdist-requirements install-runners insta # 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" $(VIRTUALENV_DIR)/bin/pip install --upgrade "pbr==5.4.3" # workaround for pbr issue # Fix for Travis CI race