Skip to content

Commit

Permalink
Merge pull request #4110 from StackStorm/upgrade_deps_v28
Browse files Browse the repository at this point in the history
Upgrade various dependencies to latest stable versions
  • Loading branch information
Kami authored May 4, 2018
2 parents d067815 + 701ced2 commit f348353
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 15 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ Changelog
in development
--------------

Changed
~~~~~~~

* Update various Python dependencies to the latest stable versions (gunicorn, gitpython,
python-gnupg, tooz, flex). #4110

Fixed
~~~~~

Expand Down
13 changes: 8 additions & 5 deletions fixed-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ greenlet==0.4.13
# Note: 0.20.0 removed select.poll() on which some of our code and libraries we
# depend on rely
eventlet==0.22.1
gunicorn==19.7.1
gunicorn==19.8.1
kombu==4.1.0
# Note: amqp is used by kombu
amqp==2.2.2
Expand All @@ -14,15 +14,15 @@ six==1.11.0
pyyaml>=3.12,<4.0
requests[security]>=2.14.1,<2.15
apscheduler==3.5.1
gitpython==2.1.8
gitpython==2.1.9
jsonschema==2.6.0
# Note: mongoengine v0.13.0 introduces memory usage regression so we can't
# upgrade - https://github.com/StackStorm/st2/pull/3597
mongoengine==0.12.0
pymongo==3.6.1
passlib==1.7.1
lockfile==0.12.2
python-gnupg==0.4.1
python-gnupg==0.4.2
jsonpath-rw==1.4.0
pyinotify==0.9.6
semver==2.7.9
Expand All @@ -36,9 +36,12 @@ virtualenv==15.1.0
sseclient==0.0.19
python-editor==1.0.3
prompt-toolkit==1.0.15
tooz==1.61.0
tooz==1.62.0
zake==0.2.2
routes==2.4.1
flex==6.12.0
flex==6.13.1
webob==1.7.4
prance==0.9.0
# test requirements below
nose-timer>=0.7.2,<0.8
psutil==5.4.5
14 changes: 7 additions & 7 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ apscheduler==3.5.1
argcomplete
bcrypt
eventlet==0.22.1
flex==6.12.0
flex==6.13.1
git+https://github.com/Kami/logshipper.git@stackstorm_patched#egg=logshipper
git+https://github.com/StackStorm/python-mistralclient.git#egg=python-mistralclient
git+https://github.com/StackStorm/st2-auth-backend-flat-file.git@master#egg=st2-auth-backend-flat-file
gitpython==2.1.8
gitpython==2.1.9
greenlet==0.4.13
gunicorn==19.7.1
gunicorn==19.8.1
ipaddr
jinja2
jsonpath-rw==1.4.0
Expand All @@ -20,19 +20,19 @@ mock
mongoengine==0.12.0
networkx==1.11
nose
nose-timer
nose-timer<0.8,>=0.7.2
oslo.config<1.13,>=1.12.1
oslo.utils<=3.33.0,>=3.15.0
paramiko==2.4.1
passlib==1.7.1
prettytable
prompt-toolkit==1.0.15
psutil
psutil==5.4.5
pyinotify==0.9.6
pymongo==3.6.1
python-dateutil
python-editor==1.0.3
python-gnupg==0.4.1
python-gnupg==0.4.2
python-json-logger
python-keyczar==0.716
pytz
Expand All @@ -45,7 +45,7 @@ semver==2.7.9
six==1.11.0
sseclient==0.0.19
stevedore==1.28.0
tooz==1.61.0
tooz==1.62.0
unittest2
webob==1.7.4
webtest
Expand Down
6 changes: 3 additions & 3 deletions test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
coverage
pep8==1.7.0
pep8==1.7.1
flake8==3.5.0
astroid==1.6.3
pylint==1.8.4
Expand All @@ -14,14 +14,14 @@ sphinx>=1.7.2,<1.8
sphinx-autobuild
# nosetests enhancements
rednose
nose-timer
nose-timer>=0.7.2,<0.8
# splitting tests run on a separate CI machines
nose-parallel
# Required by st2client tests
pyyaml<4.0,>=3.12
RandomWords
gunicorn==19.7.1
psutil
psutil==5.4.5
webtest==2.0.25
rstcheck>=3.3.0,<3.4
pyrabbit

0 comments on commit f348353

Please sign in to comment.