From affcbbe17ec9d2a625a18eb2187b255945ac270a Mon Sep 17 00:00:00 2001 From: Eugen C Date: Wed, 10 May 2017 16:21:40 +0100 Subject: [PATCH 1/4] Revert "Upgrade dependencies" --- CHANGELOG.rst | 4 +--- fixed-requirements.txt | 14 +++++++------- requirements.txt | 14 +++++++------- st2actions/tests/unit/policies/test_concurrency.py | 6 +++--- 4 files changed, 18 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 0dca06b2ed..254bee1d7e 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -45,9 +45,7 @@ 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) -* Update st2rulesengine to exit non-0 on failure (bug fix) #3394 [Andrew Regan] -* Upgrade various internal Python library dependencies to the latest stable versions (pyyaml, - requests, appscheduler, gitpython, paramiko, mongoengine, tooz). +* Update st2rulesengine to exit non-0 on failure (bug fix) 2.2.1 - April 3, 2017 --------------------- diff --git a/fixed-requirements.txt b/fixed-requirements.txt index 3edd075ab0..c406719abf 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -9,12 +9,12 @@ amqp==1.4.9 oslo.config>=1.12.1,<1.13 oslo.utils<3.1.0 six==1.10.0 -pyyaml>=3.12,<4.0 -requests[security]>=2.13.0,<2.14 -apscheduler==3.3.1 -gitpython==2.1.3 +pyyaml>=3.11,<4.0 +requests[security]>=2.11.1,<2.12 +apscheduler==3.3.0 +gitpython==2.1.0 jsonschema>=2.5.0,<2.6 -mongoengine==0.13.0 +mongoengine==0.11.0 pymongo==3.4.0 passlib==1.6.5 lockfile>=0.10.2,<0.11 @@ -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.1.2,<2.2 +paramiko>=2.0.2,<2.1 networkx==1.10 python-keyczar==0.716 retrying>=1.3,<1.4 @@ -32,7 +32,7 @@ virtualenv==15.1.0 sseclient==0.0.12 python-editor==1.0.1 prompt-toolkit==1.0.7 -tooz>=1.55.0,<1.56.0 +tooz>=1.50.0,<1.51.0 zake==0.2.2 routes==2.3.1 flex==6.5.0 diff --git a/requirements.txt b/requirements.txt index 6fa54902cd..61a27289d5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # Don't edit this file. It's generated automatically! -apscheduler==3.3.1 +apscheduler==3.3.0 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.3 +gitpython==2.1.0 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.13.0 +mongoengine==0.11.0 networkx==1.10 nose oslo.config<1.13,>=1.12.1 oslo.utils<3.1.0 -paramiko<2.2,>=2.1.2 +paramiko<2.1,>=2.0.2 passlib==1.6.5 prettytable prompt-toolkit==1.0.7 @@ -35,16 +35,16 @@ python-gnupg==0.3.9 python-json-logger python-keyczar==0.716 pytz -pyyaml<4.0,>=3.12 +pyyaml<4.0,>=3.11 rednose -requests[security]<2.14,>=2.13.0 +requests[security]<2.12,>=2.11.1 retrying<1.4,>=1.3 routes==2.3.1 semver==2.7.2 six==1.10.0 sseclient==0.0.12 stevedore<1.8,>=1.7.0 -tooz<1.56.0,>=1.55.0 +tooz<1.51.0,>=1.50.0 unittest2 webob==1.6.0 zake==0.2.2 diff --git a/st2actions/tests/unit/policies/test_concurrency.py b/st2actions/tests/unit/policies/test_concurrency.py index 54ebe4e4f3..78af2635f7 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(2) + eventlet.sleep(1) 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(2) + eventlet.sleep(1) 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(2) + eventlet.sleep(1) liveaction = LiveAction.get_by_id(str(liveaction.id)) if liveaction.status in SCHEDULED_STATES: break From 31c60658bfc96653e9b74d6fb1cea95718ee35e9 Mon Sep 17 00:00:00 2001 From: Matt Oswalt Date: Wed, 10 May 2017 09:47:30 -0700 Subject: [PATCH 2/4] Undo revert for mongoengine --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 61a27289d5..0a3ffd3a8e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,7 +17,7 @@ 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 From d05ccf42f8d4998a6f216d58b9e011d0d7cde4d1 Mon Sep 17 00:00:00 2001 From: Matt Oswalt Date: Wed, 10 May 2017 11:35:30 -0700 Subject: [PATCH 3/4] Re-applied changes except for mongoengine Signed-off-by: Matt Oswalt --- CHANGELOG.rst | 4 +++- fixed-requirements.txt | 12 ++++++------ requirements.txt | 12 ++++++------ 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 254bee1d7e..0dca06b2ed 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -45,7 +45,9 @@ 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) -* Update st2rulesengine to exit non-0 on failure (bug fix) +* Update st2rulesengine to exit non-0 on failure (bug fix) #3394 [Andrew Regan] +* Upgrade various internal Python library dependencies to the latest stable versions (pyyaml, + requests, appscheduler, gitpython, paramiko, mongoengine, tooz). 2.2.1 - April 3, 2017 --------------------- diff --git a/fixed-requirements.txt b/fixed-requirements.txt index c406719abf..df04b8206b 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -9,10 +9,10 @@ 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 -requests[security]>=2.11.1,<2.12 -apscheduler==3.3.0 -gitpython==2.1.0 +pyyaml>=3.12,<4.0 +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 pymongo==3.4.0 @@ -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 @@ -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 diff --git a/requirements.txt b/requirements.txt index 0a3ffd3a8e..6fa54902cd 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 @@ -22,7 +22,7 @@ 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,16 +35,16 @@ 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 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 fa3207506b8719db30072a2d6c17abdf3571d49c Mon Sep 17 00:00:00 2001 From: Matt Oswalt Date: Wed, 10 May 2017 11:36:53 -0700 Subject: [PATCH 4/4] Reverted to old version of mongoengine in requirements.txt Signed-off-by: Matt Oswalt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6fa54902cd..204e049abf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,7 +17,7 @@ jsonschema<2.6,>=2.5.0 kombu==3.0.37 lockfile<0.11,>=0.10.2 mock -mongoengine==0.13.0 +mongoengine==0.11.0 networkx==1.10 nose oslo.config<1.13,>=1.12.1