From 6551a8240ecc4f1f3143faa309821e751a9a3f7a Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Mon, 18 Feb 2019 10:47:31 +0100 Subject: [PATCH] Add missing entry for flex to fixed-requirements.txt and regenerate requirements. --- fixed-requirements.txt | 1 + requirements.txt | 4 ++-- st2client/requirements.txt | 2 +- st2common/requirements.txt | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/fixed-requirements.txt b/fixed-requirements.txt index ed29375589..ad652c3456 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -42,6 +42,7 @@ tooz==1.63.1 zake==0.2.2 routes==2.4.1 webob==1.8.4 +flex==6.14.0 prance==0.9.0 pywinrm==0.3.0 # test requirements below diff --git a/requirements.txt b/requirements.txt index e4a9234547..1592c36b55 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ argcomplete bcrypt cryptography==2.4.2 eventlet==0.24.1 -flex>=6.13.2,<6.15.0 +flex==6.14.0 git+https://github.com/Kami/logshipper.git@stackstorm_patched#egg=logshipper git+https://github.com/StackStorm/orquesta.git@v0.4#egg=orquesta git+https://github.com/StackStorm/python-mistralclient.git#egg=python-mistralclient @@ -43,7 +43,7 @@ python-json-logger python-statsd==2.1.0 pytz==2018.7 pywinrm==0.3.0 -pyyaml>=4.2b4,<5.2 +pyyaml<5.2,>=4.2b4 rednose requests[security]<2.15,>=2.14.1 retrying==1.3.3 diff --git a/st2client/requirements.txt b/st2client/requirements.txt index e544f4f936..d4f0de457f 100644 --- a/st2client/requirements.txt +++ b/st2client/requirements.txt @@ -8,7 +8,7 @@ prompt-toolkit==1.0.15 python-dateutil==2.7.5 python-editor==1.0.3 pytz==2018.7 -pyyaml>=4.2b4,<5.2 +pyyaml<5.2,>=4.2b4 requests[security]<2.15,>=2.14.1 six==1.12.0 sseclient==0.0.19 diff --git a/st2common/requirements.txt b/st2common/requirements.txt index 7f9445fb4f..0dbf50fa85 100644 --- a/st2common/requirements.txt +++ b/st2common/requirements.txt @@ -3,7 +3,7 @@ amqp==2.3.2 apscheduler==3.5.3 cryptography==2.4.2 eventlet==0.24.1 -flex>=6.13.2,<6.15.0 +flex==6.14.0 git+https://github.com/StackStorm/orquesta.git@v0.4#egg=orquesta greenlet==0.4.15 ipaddr @@ -18,7 +18,7 @@ paramiko==2.4.2 pymongo==3.7.2 python-dateutil==2.7.5 python-statsd==2.1.0 -pyyaml>=4.2b4,<5.2 +pyyaml<5.2,>=4.2b4 requests[security]<2.15,>=2.14.1 retrying==1.3.3 routes==2.4.1