Skip to content

Revert dependency upgrades #3597

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
Kami merged 12 commits into from
Jul 22, 2017
Merged

Revert dependency upgrades #3597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1b17373
Revert gunicorn and requests upgrade.
Kami Jul 21, 2017
cbe0112
Revert gunicorn upgrade revert.
Kami Jul 21, 2017
1797350
Downgrade mongoengine, 0.13.0 doubles the memory usage which is
Kami Jul 21, 2017
392684c
Add a note.
Kami Jul 21, 2017
82ba675
Update rest requirements.
Kami Jul 21, 2017
07a90a6
Merge branch 'master' into revert_deps_upgrade
Jul 21, 2017
5e3a07e
Fix 'fixed-requirements.txt' format
Jul 21, 2017
af1059e
Update code so it works with older requests version.
Kami Jul 21, 2017
7713fa5
Merge branch 'revert_deps_upgrade' of github.com:StackStorm/st2 into …
Kami Jul 21, 2017
e4b4fdd
Upgrade requests, add certifi dependency which request depends on.
Kami Jul 21, 2017
652c406
Update requests requirement to the same version everywhere, regenerate
Kami Jul 22, 2017
33b2b5a
Fix false pylint warning.
Kami Jul 22, 2017
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
7 changes: 5 additions & 2 deletions fixed-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ oslo.config>=1.12.1,<1.13
oslo.utils<3.1.0
six==1.10.0
pyyaml>=3.12,<4.0
requests[security]>=2.18.1,<2.19
requests[security]==2.18.1
apscheduler==3.3.1
gitpython==2.1.5
jsonschema==2.6.0
mongoengine==0.13.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.4.0
passlib==1.7.1
lockfile==0.12.2
Expand All @@ -40,3 +42,4 @@ routes==2.4.1
flex==6.10.0
webob==1.7.3
prance==0.6.1
certifi==2017.4.17
5 changes: 3 additions & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
apscheduler==3.3.1
argcomplete
bcrypt
certifi==2017.4.17
eventlet==0.19.0
flex==6.10.0
git+https://github.com/Kami/entrypoints.git@dont_use_backports#egg=entrypoints
Expand All @@ -17,7 +18,7 @@ jsonschema==2.6.0
kombu==4.0.2
lockfile==0.12.2
mock
mongoengine==0.13.0
mongoengine==0.12.0
networkx==1.11
nose
oslo.config<1.13,>=1.12.1
Expand All @@ -38,7 +39,7 @@ python-keyczar==0.716
pytz
pyyaml<4.0,>=3.12
rednose
requests[security]<2.19,>=2.18.1
requests[security]==2.18.1
retrying==1.3.3
routes==2.4.1
semver==2.7.7
Expand Down
3 changes: 2 additions & 1 deletion st2client/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ python-dateutil
python-editor==1.0.1
pytz
pyyaml<4.0,>=3.11
requests[security]<2.12,>=2.11.1
requests[security]==2.18.1
certifi==2017.4.17
six==1.10.0
sseclient==0.0.12
3 changes: 2 additions & 1 deletion st2client/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@
'prettytable',
'python-dateutil',
'pyyaml<4.0,>=3.11',
'requests<3.0,>=2.7.0',
'requests[security]==2.18.1',
'certifi',
'six==1.10.0'
],
dependency_links=[],
Expand Down
5 changes: 2 additions & 3 deletions st2client/st2client/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@

import six
import requests
import urllib3

from urllib3.exceptions import InsecureRequestWarning
# pylint: disable=import-error
from requests.packages.urllib3.exceptions import InsecureRequestWarning

from st2client import models
from st2client.config_parser import CLIConfigParser
Expand Down Expand Up @@ -107,7 +107,6 @@ def get_client(self, args, debug=False):
silence_ssl_warnings = rc_config.get('general', {}).get('silence_ssl_warnings', False)
if silence_ssl_warnings:
# pylint: disable=no-member
urllib3.disable_warnings(InsecureRequestWarning)
requests.packages.urllib3.disable_warnings(InsecureRequestWarning)

# We skip automatic authentication for some commands such as auth
Expand Down
1 change: 1 addition & 0 deletions st2common/in-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ routes
flex
webob
prance
certifi
2 changes: 1 addition & 1 deletion test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ nose-parallel
# Required by st2client tests
pyyaml<4.0,>=3.12
RandomWords
gunicorn==19.6.0
gunicorn==19.7.1
psutil
webtest==2.0.25
rstcheck>=3.1.0,<3.2