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

Jump to bottom

issue 5060 upgrade virtualenv to latest (20.2.2) #5094

Closed
wants to merge 7 commits into from
Closed

issue 5060 upgrade virtualenv to latest (20.2.2) #5094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
249b078
issue 5060 upgrade virtualenv to latest (20.2.1)
kroustou Nov 26, 2020
c045750
Update based on review comments
kroustou Dec 13, 2020
b9a9c07
Merge branch 'master' into 5060_pip_to_latest
amanda11 Jan 23, 2021
5bda33c
Update to resolve conflicts
amanda11 Jan 23, 2021
791dc5f
Update Makefile
amanda11 Jan 23, 2021
91a53a8
Update Makefile
amanda11 Jan 24, 2021
aecd00c
Merge branch 'master' into 5060_pip_to_latest
kroustou Jan 30, 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
6 changes: 3 additions & 3 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,14 @@ 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

* Converted most CI jobs from Travis to GitHub Actions (all except Integration tests).
* Upgrade virtualenv version to latest - 20.2.2 (improvement) #5094
Contributed by @kroustou

* Converted most CI jobs from Travis to GitHub Actions (all except Integration tests).
Contributed by @nmaludy, @winem, and @blag

Fixed
Expand All @@ -48,7 +49,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
Expand Down
7 changes: 0 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,12 +394,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"
Expand Down Expand Up @@ -533,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
Expand Down
4 changes: 2 additions & 2 deletions fixed-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ six==1.13.0
# NOTE: sseclient has various issues which sometimes hang the connection for a long time, etc.
sseclient-py==1.7
stevedore==1.30.1
# 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
tooz==2.8.0
# Note: We use latest version of virtualenv which uses pip 19
virtualenv==16.6.0
webob==1.8.5
zake==0.2.2
# test requirements below
Expand Down