From 1b173730ace79877f22735cfb0753a5d48eecbb2 Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Fri, 21 Jul 2017 14:17:11 +0200 Subject: [PATCH 01/10] Revert gunicorn and requests upgrade. --- fixed-requirements.txt | 4 ++-- requirements.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fixed-requirements.txt b/fixed-requirements.txt index d8e3f1ffd2..b0c01e599b 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -4,7 +4,7 @@ greenlet==0.4.12 # Note: 0.20.0 removed select.poll() on which some of our code and libraries we # depend on rely eventlet==0.19.0 -gunicorn==19.7.1 +gunicorn==19.6.0 kombu==4.0.2 # Note: amqp is used by kombu amqp==2.2.1 @@ -12,7 +12,7 @@ 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.15,>=2.14.1 apscheduler==3.3.1 gitpython==2.1.5 jsonschema==2.6.0 diff --git a/requirements.txt b/requirements.txt index 50bfd81ae4..a0cf8a2e4e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ 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.5 -gunicorn==19.7.1 +gunicorn==19.6.0 ipaddr jinja2 jsonpath-rw==1.4.0 @@ -38,7 +38,7 @@ python-keyczar==0.716 pytz pyyaml<4.0,>=3.12 rednose -requests[security]<2.19,>=2.18.1 +requests[security]<2.15,>=2.14.1 retrying==1.3.3 routes==2.4.1 semver==2.7.7 From cbe0112afac4c06c58bc0c8c686966ec5d354762 Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Fri, 21 Jul 2017 14:27:20 +0200 Subject: [PATCH 02/10] Revert gunicorn upgrade revert. --- fixed-requirements.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fixed-requirements.txt b/fixed-requirements.txt index b0c01e599b..5e43d508c9 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -4,7 +4,7 @@ greenlet==0.4.12 # Note: 0.20.0 removed select.poll() on which some of our code and libraries we # depend on rely eventlet==0.19.0 -gunicorn==19.6.0 +gunicorn==19.7.1 kombu==4.0.2 # Note: amqp is used by kombu amqp==2.2.1 diff --git a/requirements.txt b/requirements.txt index a0cf8a2e4e..f6e6351ed8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ 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.5 -gunicorn==19.6.0 +gunicorn==19.7.1 ipaddr jinja2 jsonpath-rw==1.4.0 From 17973501c22f3354bc9085f84271b011f9935402 Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Fri, 21 Jul 2017 15:09:28 +0200 Subject: [PATCH 03/10] Downgrade mongoengine, 0.13.0 doubles the memory usage which is unacceptable. --- fixed-requirements.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fixed-requirements.txt b/fixed-requirements.txt index 5e43d508c9..7fa79bfdf1 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -16,7 +16,7 @@ requests[security]<2.15,>=2.14.1 apscheduler==3.3.1 gitpython==2.1.5 jsonschema==2.6.0 -mongoengine==0.13.0 +mongoengine==0.12.0 pymongo==3.4.0 passlib==1.7.1 lockfile==0.12.2 diff --git a/requirements.txt b/requirements.txt index f6e6351ed8..917a17908b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,7 +17,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 From 392684cdcd9fb27c56a1934c6ad8dd058cef23bf Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Fri, 21 Jul 2017 15:48:37 +0200 Subject: [PATCH 04/10] Add a note. --- fixed-requirements.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fixed-requirements.txt b/fixed-requirements.txt index 7fa79bfdf1..d46dc3f9c2 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -16,6 +16,8 @@ requests[security]<2.15,>=2.14.1 apscheduler==3.3.1 gitpython==2.1.5 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.4.0 passlib==1.7.1 From 82ba67598763bf05f8d9747d4bc2a40eeed76493 Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Fri, 21 Jul 2017 15:52:36 +0200 Subject: [PATCH 05/10] Update rest requirements. --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index b9b2a038e1..31eb8e24da 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -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 From 5e3a07e527dec30a8a2767661c25a08a33a30882 Mon Sep 17 00:00:00 2001 From: armab Date: Fri, 21 Jul 2017 20:12:22 +0300 Subject: [PATCH 06/10] Fix 'fixed-requirements.txt' format --- fixed-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fixed-requirements.txt b/fixed-requirements.txt index d46dc3f9c2..20c8cc5c02 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -12,7 +12,7 @@ oslo.config>=1.12.1,<1.13 oslo.utils<3.1.0 six==1.10.0 pyyaml>=3.12,<4.0 -requests[security]<2.15,>=2.14.1 +requests[security]>=2.14.1,<2.15 apscheduler==3.3.1 gitpython==2.1.5 jsonschema==2.6.0 From af1059e71aab89318ec19cbb39048ba03d1b7e7a Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Fri, 21 Jul 2017 20:00:16 +0200 Subject: [PATCH 07/10] Update code so it works with older requests version. --- st2client/st2client/base.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/st2client/st2client/base.py b/st2client/st2client/base.py index 7ffeed2e12..1fc702a5a5 100644 --- a/st2client/st2client/base.py +++ b/st2client/st2client/base.py @@ -23,9 +23,8 @@ import six import requests -import urllib3 -from urllib3.exceptions import InsecureRequestWarning +from requests.packages.urllib3.exceptions import InsecureRequestWarning from st2client import models from st2client.config_parser import CLIConfigParser @@ -107,7 +106,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 From e4b4fddd0ee0a0d7d73bf25f19760d892a9558e7 Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Fri, 21 Jul 2017 20:03:07 +0200 Subject: [PATCH 08/10] Upgrade requests, add certifi dependency which request depends on. --- fixed-requirements.txt | 3 ++- st2common/in-requirements.txt | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/fixed-requirements.txt b/fixed-requirements.txt index 20c8cc5c02..ea66e50b9e 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -12,7 +12,7 @@ oslo.config>=1.12.1,<1.13 oslo.utils<3.1.0 six==1.10.0 pyyaml>=3.12,<4.0 -requests[security]>=2.14.1,<2.15 +requests[security]==2.18.1 apscheduler==3.3.1 gitpython==2.1.5 jsonschema==2.6.0 @@ -42,3 +42,4 @@ routes==2.4.1 flex==6.10.0 webob==1.7.3 prance==0.6.1 +certifi==2017.4.17 diff --git a/st2common/in-requirements.txt b/st2common/in-requirements.txt index 149062478a..f1490bf944 100644 --- a/st2common/in-requirements.txt +++ b/st2common/in-requirements.txt @@ -27,3 +27,4 @@ routes flex webob prance +certifi From 652c406d6fdd6c182e90f7361870ddfcbdc90067 Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Sat, 22 Jul 2017 10:12:54 +0200 Subject: [PATCH 09/10] Update requests requirement to the same version everywhere, regenerate requirements.txt. --- requirements.txt | 3 ++- st2client/requirements.txt | 3 ++- st2client/setup.py | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 917a17908b..d70b5c6432 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 @@ -38,7 +39,7 @@ python-keyczar==0.716 pytz pyyaml<4.0,>=3.12 rednose -requests[security]<2.15,>=2.14.1 +requests[security]==2.18.1 retrying==1.3.3 routes==2.4.1 semver==2.7.7 diff --git a/st2client/requirements.txt b/st2client/requirements.txt index 8ee9aa5469..b9ac2c5156 100644 --- a/st2client/requirements.txt +++ b/st2client/requirements.txt @@ -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 diff --git a/st2client/setup.py b/st2client/setup.py index 7cb1916f19..2f2db7a5bb 100644 --- a/st2client/setup.py +++ b/st2client/setup.py @@ -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=[], From 33b2b5a59de895acc6f0271315b22e094391e9ff Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Sat, 22 Jul 2017 10:17:02 +0200 Subject: [PATCH 10/10] Fix false pylint warning. --- st2client/st2client/base.py | 1 + 1 file changed, 1 insertion(+) diff --git a/st2client/st2client/base.py b/st2client/st2client/base.py index 1fc702a5a5..f241f67bf3 100644 --- a/st2client/st2client/base.py +++ b/st2client/st2client/base.py @@ -24,6 +24,7 @@ import six import requests +# pylint: disable=import-error from requests.packages.urllib3.exceptions import InsecureRequestWarning from st2client import models