Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
---------------------
Expand Down
14 changes: 7 additions & 7 deletions fixed-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.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
mongoengine==0.13.0
pymongo==3.4.0
passlib==1.6.5
lockfile>=0.10.2,<0.11
Expand All @@ -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
Expand All @@ -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
Expand Down
14 changes: 7 additions & 7 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Copy link
Member

@arm4b arm4b May 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The latest version is 2.14 and even 2.14.1, see changelog: https://github.com/kennethreitz/requests/blob/master/HISTORY.rst

We know that it fixes urllib3/urllib3#1104 (comment) bug
Can we pin to latest instead? That will recover st2cicd.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works for me

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+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.51.0,>=1.50.0
tooz<1.56.0,>=1.55.0
unittest2
webob==1.6.0
zake==0.2.2
6 changes: 3 additions & 3 deletions st2actions/tests/unit/policies/test_concurrency.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down