Skip to content

Commit c250554

Browse files
authored
Merge pull request #4510 from StackStorm/update_pyyaml_to_latest
Upgrade pyyaml to the latest version
2 parents 09fc032 + dcecb89 commit c250554

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

fixed-requirements.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ amqp==2.3.2
1313
oslo.config>=1.12.1,<1.13
1414
oslo.utils>=3.36.2,<=3.37.0
1515
six==1.12.0
16-
pyyaml==3.13
16+
pyyaml>=4.2b4,<5.2
1717
requests[security]<2.15,>=2.14.1
1818
apscheduler==3.5.3
1919
gitpython==2.1.11
@@ -41,7 +41,6 @@ prompt-toolkit==1.0.15
4141
tooz==1.63.1
4242
zake==0.2.2
4343
routes==2.4.1
44-
flex==6.13.2
4544
webob==1.8.4
4645
prance==0.9.0
4746
pywinrm==0.3.0

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ argcomplete
66
bcrypt
77
cryptography==2.4.2
88
eventlet==0.24.1
9-
flex==6.13.2
9+
flex>=6.13.2,<6.15.0
1010
git+https://github.com/Kami/logshipper.git@stackstorm_patched#egg=logshipper
1111
git+https://github.com/StackStorm/[email protected]#egg=orquesta
1212
git+https://github.com/StackStorm/python-mistralclient.git#egg=python-mistralclient
@@ -43,7 +43,7 @@ python-json-logger
4343
python-statsd==2.1.0
4444
pytz==2018.7
4545
pywinrm==0.3.0
46-
pyyaml==3.13
46+
pyyaml>=4.2b4,<5.2
4747
rednose
4848
requests[security]<2.15,>=2.14.1
4949
retrying==1.3.3

st2client/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ prompt-toolkit==1.0.15
88
python-dateutil==2.7.5
99
python-editor==1.0.3
1010
pytz==2018.7
11-
pyyaml==3.13
11+
pyyaml>=4.2b4,<5.2
1212
requests[security]<2.15,>=2.14.1
1313
six==1.12.0
1414
sseclient==0.0.19

st2common/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ amqp==2.3.2
33
apscheduler==3.5.3
44
cryptography==2.4.2
55
eventlet==0.24.1
6-
flex==6.13.2
6+
flex>=6.13.2,<6.15.0
77
git+https://github.com/StackStorm/[email protected]#egg=orquesta
88
greenlet==0.4.15
99
ipaddr
@@ -18,7 +18,7 @@ paramiko==2.4.2
1818
pymongo==3.7.2
1919
python-dateutil==2.7.5
2020
python-statsd==2.1.0
21-
pyyaml==3.13
21+
pyyaml>=4.2b4,<5.2
2222
requests[security]<2.15,>=2.14.1
2323
retrying==1.3.3
2424
routes==2.4.1

test-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ nose-timer>=0.7.4,<0.8
1919
# splitting tests run on a separate CI machines
2020
nose-parallel==0.3.1
2121
# Required by st2client tests
22-
pyyaml<4.0,>=3.12
22+
pyyaml>=4.2b4,<5.2
2323
RandomWords
2424
gunicorn==19.9.0
2525
psutil==5.4.8

0 commit comments

Comments
 (0)