From c51e7035a7cf0aa63e336ed438239743dcf25de8 Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Wed, 5 Apr 2017 14:23:42 +0200 Subject: [PATCH 01/11] Upgrade paramiko to v2.1.2. --- fixed-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fixed-requirements.txt b/fixed-requirements.txt index 5a2398a712..5bd03a7216 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -23,7 +23,7 @@ jsonpath-rw>=1.3.0 pyinotify>=0.9.5,<=0.10 semver==2.7.2 stevedore>=1.7.0,<1.8 -paramiko>=2.0.2,<2.1 +paramiko>=2.1.2,<2.2 networkx==1.10 python-keyczar==0.716 retrying>=1.3,<1.4 From ffa68797d525e42915f21fa5cc27e09ae901ca37 Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Wed, 5 Apr 2017 14:25:53 +0200 Subject: [PATCH 02/11] Upgrade gitpython to v2.1.3. --- fixed-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fixed-requirements.txt b/fixed-requirements.txt index 5bd03a7216..0609d7ab46 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -12,7 +12,7 @@ six==1.10.0 pyyaml>=3.11,<4.0 requests[security]>=2.11.1,<2.12 apscheduler==3.3.0 -gitpython==2.1.0 +gitpython==2.1.3 jsonschema>=2.5.0,<2.6 mongoengine==0.11.0 pymongo==3.4.0 From d8437d559b1caf019b516d0144b0dd51328dbc46 Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Wed, 5 Apr 2017 14:27:11 +0200 Subject: [PATCH 03/11] Update appscheduler to v3.3.1. --- fixed-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fixed-requirements.txt b/fixed-requirements.txt index 0609d7ab46..d81cee945d 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -11,7 +11,7 @@ oslo.utils<3.1.0 six==1.10.0 pyyaml>=3.11,<4.0 requests[security]>=2.11.1,<2.12 -apscheduler==3.3.0 +apscheduler==3.3.1 gitpython==2.1.3 jsonschema>=2.5.0,<2.6 mongoengine==0.11.0 From 3cb0cc8161d1dac8c267de164ea898364073adb0 Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Wed, 5 Apr 2017 14:29:07 +0200 Subject: [PATCH 04/11] Upgrade pyyaml to v3.12. --- fixed-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fixed-requirements.txt b/fixed-requirements.txt index d81cee945d..07afb56be0 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -9,7 +9,7 @@ amqp==1.4.9 oslo.config>=1.12.1,<1.13 oslo.utils<3.1.0 six==1.10.0 -pyyaml>=3.11,<4.0 +pyyaml>=3.12,<4.0 requests[security]>=2.11.1,<2.12 apscheduler==3.3.1 gitpython==2.1.3 From e2c980c10b7b666757f2003ba2cec74863da7541 Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Wed, 5 Apr 2017 14:31:37 +0200 Subject: [PATCH 05/11] Upgrade requests to v2.13.0. --- fixed-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fixed-requirements.txt b/fixed-requirements.txt index 07afb56be0..e7873b5bd8 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -10,7 +10,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.11.1,<2.12 +requests[security]>=2.13.0,<2.14 apscheduler==3.3.1 gitpython==2.1.3 jsonschema>=2.5.0,<2.6 From bd73889f918907604014fb342bee5e420ac18e55 Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Thu, 20 Apr 2017 20:34:09 +0200 Subject: [PATCH 06/11] Upgrade mongoengine to v0.13.0. --- fixed-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fixed-requirements.txt b/fixed-requirements.txt index 85130f21ab..bd1c97fb3b 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -14,7 +14,7 @@ requests[security]>=2.13.0,<2.14 apscheduler==3.3.1 gitpython==2.1.3 jsonschema>=2.5.0,<2.6 -mongoengine==0.11.0 +mongoengine==0.13.0 pymongo==3.4.0 passlib==1.6.5 lockfile>=0.10.2,<0.11 From b4cdc98c4c91d33895e77daacd4d56be0f6e6daa Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Fri, 21 Apr 2017 07:35:16 +0200 Subject: [PATCH 07/11] Re-generate requirements.txt --- requirements.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index 61a27289d5..000b57df89 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # Don't edit this file. It's generated automatically! -apscheduler==3.3.0 +apscheduler==3.3.1 argcomplete bcrypt eventlet<0.19,>=0.18.4 @@ -8,7 +8,7 @@ git+https://github.com/Kami/entrypoints.git@dont_use_backports#egg=entrypoints 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.0 +gitpython==2.1.3 gunicorn==19.6.0 ipaddr jinja2 @@ -17,12 +17,12 @@ jsonschema<2.6,>=2.5.0 kombu==3.0.37 lockfile<0.11,>=0.10.2 mock -mongoengine==0.11.0 +mongoengine==0.13.0 networkx==1.10 nose oslo.config<1.13,>=1.12.1 oslo.utils<3.1.0 -paramiko<2.1,>=2.0.2 +paramiko<2.2,>=2.1.2 passlib==1.6.5 prettytable prompt-toolkit==1.0.7 @@ -35,9 +35,9 @@ python-gnupg==0.3.9 python-json-logger python-keyczar==0.716 pytz -pyyaml<4.0,>=3.11 +pyyaml<4.0,>=3.12 rednose -requests[security]<2.12,>=2.11.1 +requests[security]<2.14,>=2.13.0 retrying<1.4,>=1.3 routes==2.3.1 semver==2.7.2 From 128280a77bd1da4868484b6244d08bb2a534c95a Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Mon, 8 May 2017 15:35:23 +0200 Subject: [PATCH 08/11] Upgrade tooz to v1.55.0. --- fixed-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fixed-requirements.txt b/fixed-requirements.txt index bd1c97fb3b..3edd075ab0 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -32,7 +32,7 @@ virtualenv==15.1.0 sseclient==0.0.12 python-editor==1.0.1 prompt-toolkit==1.0.7 -tooz>=1.50.0,<1.51.0 +tooz>=1.55.0,<1.56.0 zake==0.2.2 routes==2.3.1 flex==6.5.0 From 8c1f7975c8d8980283502c9a4faede4de3ba44e8 Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Mon, 8 May 2017 15:37:14 +0200 Subject: [PATCH 09/11] Update changelog. --- CHANGELOG.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5774370b3b..0c95676a8d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -45,6 +45,8 @@ in development rule with `file_path` and sensor will pick up the `file_path` from the rule. A sample rule is provided in contrib/examples/rules/sample_rule_file_watch.yaml. (improvement) * Cancel actions that are Mistral workflow when the parent workflow is cancelled. (improvement) +* Upgrade various internal Python library dependencies to the latest stable versions (pyyaml, + requests, appscheduler, gitpython, paramiko, mongoengine, tooz). 2.2.1 - April 3, 2017 --------------------- From 697b378f311c3935e1350242cc88739345b6e51d Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Mon, 8 May 2017 15:50:17 +0200 Subject: [PATCH 10/11] Re-generate requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 000b57df89..6fa54902cd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -44,7 +44,7 @@ semver==2.7.2 six==1.10.0 sseclient==0.0.12 stevedore<1.8,>=1.7.0 -tooz<1.51.0,>=1.50.0 +tooz<1.56.0,>=1.55.0 unittest2 webob==1.6.0 zake==0.2.2 From 6375d8ecee66b7a3ede4afe42137a9c4c5b34d0b Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Mon, 8 May 2017 15:54:44 +0200 Subject: [PATCH 11/11] Try increasing sleep. --- st2actions/tests/unit/policies/test_concurrency.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/st2actions/tests/unit/policies/test_concurrency.py b/st2actions/tests/unit/policies/test_concurrency.py index 78af2635f7..54ebe4e4f3 100644 --- a/st2actions/tests/unit/policies/test_concurrency.py +++ b/st2actions/tests/unit/policies/test_concurrency.py @@ -248,7 +248,7 @@ def test_on_cancellation(self): # Since states are being processed asynchronously, wait for the # liveactions to go into scheduled states. for i in range(0, 100): - eventlet.sleep(1) + eventlet.sleep(2) scheduled = [item for item in LiveAction.get_all() if item.status in SCHEDULED_STATES] if len(scheduled) == policy_db.parameters['threshold']: break @@ -272,7 +272,7 @@ def test_on_cancellation(self): # Since states are being processed asynchronously, wait for the # liveaction to go into delayed state. for i in range(0, 100): - eventlet.sleep(1) + eventlet.sleep(2) liveaction = LiveAction.get_by_id(str(liveaction.id)) if liveaction.status == action_constants.LIVEACTION_STATUS_DELAYED: break @@ -291,7 +291,7 @@ def test_on_cancellation(self): # Since states are being processed asynchronously, wait for the # liveaction to go into scheduled state. for i in range(0, 100): - eventlet.sleep(1) + eventlet.sleep(2) liveaction = LiveAction.get_by_id(str(liveaction.id)) if liveaction.status in SCHEDULED_STATES: break