From 8eaf3b9f4aef027dbcb303fa970bf314e0795bb9 Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Tue, 22 Jan 2019 18:44:42 +0100
Subject: [PATCH 1/5] Pin pyyaml to  latest version.

NOTE: Security vulnerability doesn't affect our code because we already
use yaml.safe_load everywhere, but it's still good to update.
---
 fixed-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fixed-requirements.txt b/fixed-requirements.txt
index 81aeafa176..dfb26222d8 100644
--- a/fixed-requirements.txt
+++ b/fixed-requirements.txt
@@ -13,7 +13,7 @@ amqp==2.3.2
 oslo.config>=1.12.1,<1.13
 oslo.utils>=3.36.2,<=3.37.0
 six==1.12.0
-pyyaml==3.13
+pyyaml==4.2b4
 requests[security]<2.15,>=2.14.1
 apscheduler==3.5.3
 gitpython==2.1.11

From fc9070502b070d3c3e905b3b58f0a5302133fa5d Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Tue, 22 Jan 2019 18:48:28 +0100
Subject: [PATCH 2/5] Re-generate requirements file and use our flex work which
 doesn't pin pyyaml to old version.

---
 fixed-requirements.txt        | 1 -
 requirements.txt              | 4 ++--
 st2client/requirements.txt    | 2 +-
 st2common/in-requirements.txt | 2 +-
 st2common/requirements.txt    | 4 ++--
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/fixed-requirements.txt b/fixed-requirements.txt
index dfb26222d8..b66b7ae2c5 100644
--- a/fixed-requirements.txt
+++ b/fixed-requirements.txt
@@ -41,7 +41,6 @@ prompt-toolkit==1.0.15
 tooz==1.63.1
 zake==0.2.2
 routes==2.4.1
-flex==6.13.2
 webob==1.8.4
 prance==0.9.0
 pywinrm==0.3.0
diff --git a/requirements.txt b/requirements.txt
index 4bbb77c15f..29c95ef1eb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,8 +6,8 @@ argcomplete
 bcrypt
 cryptography==2.4.2
 eventlet==0.24.1
-flex==6.13.2
 git+https://github.com/Kami/logshipper.git@stackstorm_patched#egg=logshipper
+git+https://github.com/StackStorm/flex.git@pyyaml_pin_fix#egg=flex
 git+https://github.com/StackStorm/orquesta.git@v0.3#egg=orquesta
 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
@@ -44,7 +44,7 @@ python-json-logger
 python-statsd==2.1.0
 pytz==2018.7
 pywinrm==0.3.0
-pyyaml==3.13
+pyyaml==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 037fa0cffc..62ba165b1b 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==3.13
+pyyaml==4.2b4
 requests[security]<2.15,>=2.14.1
 six==1.12.0
 sseclient==0.0.19
diff --git a/st2common/in-requirements.txt b/st2common/in-requirements.txt
index cd3665dbea..45084a6f32 100644
--- a/st2common/in-requirements.txt
+++ b/st2common/in-requirements.txt
@@ -25,7 +25,7 @@ tooz
 zake
 ipaddr
 routes
-flex
+git+https://github.com/StackStorm/flex.git@pyyaml_pin_fix#egg=flex
 webob
 jsonpath-rw
 python-statsd
diff --git a/st2common/requirements.txt b/st2common/requirements.txt
index 5b8ebc0dba..a87e223255 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
+git+https://github.com/StackStorm/flex.git@pyyaml_pin_fix#egg=flex
 git+https://github.com/StackStorm/orquesta.git@v0.3#egg=orquesta
 greenlet==0.4.15
 ipaddr
@@ -19,7 +19,7 @@ prometheus_client==0.1.1
 pymongo==3.7.2
 python-dateutil==2.7.5
 python-statsd==2.1.0
-pyyaml==3.13
+pyyaml==4.2b4
 requests[security]<2.15,>=2.14.1
 retrying==1.3.3
 routes==2.4.1

From 25a3ff01a3b0f94065418231f11677764fa33d8e Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Tue, 22 Jan 2019 18:51:31 +0100
Subject: [PATCH 3/5] Also update pyyaml in test requirements.

---
 test-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index 287c6a9500..f9642cceb0 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -18,7 +18,7 @@ nose-timer>=0.7.4,<0.8
 # splitting tests run on a separate CI machines
 nose-parallel==0.3.1
 # Required by st2client tests
-pyyaml<4.0,>=3.12
+pyyaml==4.2b4
 RandomWords
 gunicorn==19.7.1
 psutil==5.4.5

From f23aed05095bddad415187e3e0f14663b8378cfa Mon Sep 17 00:00:00 2001
From: blag <blag@users.noreply.github.com>
Date: Tue, 29 Jan 2019 21:28:03 -0800
Subject: [PATCH 4/5] Update requirements to PyYAML >=4.2b,<5.2 and a possible
 bump to flex

---
 fixed-requirements.txt        | 2 +-
 requirements.txt              | 4 ++--
 st2client/requirements.txt    | 2 +-
 st2common/in-requirements.txt | 2 +-
 st2common/requirements.txt    | 4 ++--
 test-requirements.txt         | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/fixed-requirements.txt b/fixed-requirements.txt
index b66b7ae2c5..297941ef8f 100644
--- a/fixed-requirements.txt
+++ b/fixed-requirements.txt
@@ -13,7 +13,7 @@ amqp==2.3.2
 oslo.config>=1.12.1,<1.13
 oslo.utils>=3.36.2,<=3.37.0
 six==1.12.0
-pyyaml==4.2b4
+pyyaml>=4.2b4,<5.2
 requests[security]<2.15,>=2.14.1
 apscheduler==3.5.3
 gitpython==2.1.11
diff --git a/requirements.txt b/requirements.txt
index 4a2c58e099..5621deea04 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,8 +6,8 @@ argcomplete
 bcrypt
 cryptography==2.4.2
 eventlet==0.24.1
+flex>=6.13.2,<6.13.4
 git+https://github.com/Kami/logshipper.git@stackstorm_patched#egg=logshipper
-git+https://github.com/StackStorm/flex.git@pyyaml_pin_fix#egg=flex
 git+https://github.com/StackStorm/orquesta.git@v0.3#egg=orquesta
 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
@@ -43,7 +43,7 @@ python-json-logger
 python-statsd==2.1.0
 pytz==2018.7
 pywinrm==0.3.0
-pyyaml==4.2b4
+pyyaml>=4.2b4,<5.2
 rednose
 requests[security]<2.15,>=2.14.1
 retrying==1.3.3
diff --git a/st2client/requirements.txt b/st2client/requirements.txt
index 62ba165b1b..e544f4f936 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
+pyyaml>=4.2b4,<5.2
 requests[security]<2.15,>=2.14.1
 six==1.12.0
 sseclient==0.0.19
diff --git a/st2common/in-requirements.txt b/st2common/in-requirements.txt
index 8383520e34..cd84781201 100644
--- a/st2common/in-requirements.txt
+++ b/st2common/in-requirements.txt
@@ -25,7 +25,7 @@ tooz
 zake
 ipaddr
 routes
-git+https://github.com/StackStorm/flex.git@pyyaml_pin_fix#egg=flex
+flex
 webob
 jsonpath-rw
 python-statsd
diff --git a/st2common/requirements.txt b/st2common/requirements.txt
index 35c1aa5416..f111a0d236 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
-git+https://github.com/StackStorm/flex.git@pyyaml_pin_fix#egg=flex
+flex>=6.13.2,<6.13.4
 git+https://github.com/StackStorm/orquesta.git@v0.3#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
+pyyaml>=4.2b4,<5.2
 requests[security]<2.15,>=2.14.1
 retrying==1.3.3
 routes==2.4.1
diff --git a/test-requirements.txt b/test-requirements.txt
index b5fa8f4c54..f898b88685 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -19,7 +19,7 @@ nose-timer>=0.7.4,<0.8
 # splitting tests run on a separate CI machines
 nose-parallel==0.3.1
 # Required by st2client tests
-pyyaml==4.2b4
+pyyaml>=4.2b4,<5.2
 RandomWords
 gunicorn==19.9.0
 psutil==5.4.8

From dcecb89f46f318659f371da32e92239f4c4fda9d Mon Sep 17 00:00:00 2001
From: blag <blag@users.noreply.github.com>
Date: Tue, 12 Feb 2019 13:55:04 -0800
Subject: [PATCH 5/5] Use flex v6.14.0

---
 requirements.txt           | 2 +-
 st2common/requirements.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 2e03151727..1b9bb5f1e6 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.13.4
+flex>=6.13.2,<6.15.0
 git+https://github.com/Kami/logshipper.git@stackstorm_patched#egg=logshipper
 git+https://github.com/StackStorm/orquesta.git@v0.3#egg=orquesta
 git+https://github.com/StackStorm/python-mistralclient.git#egg=python-mistralclient
diff --git a/st2common/requirements.txt b/st2common/requirements.txt
index f111a0d236..5b545f655e 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.13.4
+flex>=6.13.2,<6.15.0
 git+https://github.com/StackStorm/orquesta.git@v0.3#egg=orquesta
 greenlet==0.4.15
 ipaddr