1*4882a593SmuzhiyunFrom 3be619b814c16c02a02499e7a157dabd065926dd Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Sergey Fursov <geyser85@gmail.com> 3*4882a593SmuzhiyunDate: Sun, 31 Mar 2019 12:45:50 +0700 4*4882a593SmuzhiyunSubject: [PATCH] support PyYAML up to 5.1 version 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunSigned-off-by: Sergey Fursov <geyser85@gmail.com> 7*4882a593Smuzhiyun[Upstream: https://github.com/docker/compose/pull/6623] 8*4882a593Smuzhiyun(cherry picked from commit d2ca096f46a56cd4db494c593ed84e5c255dc15d) 9*4882a593Smuzhiyun[Peter: allow all 5.x] 10*4882a593SmuzhiyunSigned-off-by: Peter Korsgaard <peter@korsgaard.com> 11*4882a593Smuzhiyun--- 12*4882a593Smuzhiyun requirements.txt | 2 +- 13*4882a593Smuzhiyun setup.py | 2 +- 14*4882a593Smuzhiyun 2 files changed, 2 insertions(+), 2 deletions(-) 15*4882a593Smuzhiyun 16*4882a593Smuzhiyundiff --git a/requirements.txt b/requirements.txt 17*4882a593Smuzhiyunindex d868fdeb..e3dbc807 100644 18*4882a593Smuzhiyun--- a/requirements.txt 19*4882a593Smuzhiyun+++ b/requirements.txt 20*4882a593Smuzhiyun@@ -16,7 +16,7 @@ paramiko==2.4.2 21*4882a593Smuzhiyun pypiwin32==219; sys_platform == 'win32' and python_version < '3.6' 22*4882a593Smuzhiyun pypiwin32==223; sys_platform == 'win32' and python_version >= '3.6' 23*4882a593Smuzhiyun PySocks==1.6.7 24*4882a593Smuzhiyun-PyYAML==4.2b1 25*4882a593Smuzhiyun+PyYAML==5.1 26*4882a593Smuzhiyun requests==2.20.0 27*4882a593Smuzhiyun six==1.10.0 28*4882a593Smuzhiyun texttable==1.6.2 29*4882a593Smuzhiyundiff --git a/setup.py b/setup.py 30*4882a593Smuzhiyunindex c9e4729d..17ab678e 100644 31*4882a593Smuzhiyun--- a/setup.py 32*4882a593Smuzhiyun+++ b/setup.py 33*4882a593Smuzhiyun@@ -32,7 +32,7 @@ def find_version(*file_paths): 34*4882a593Smuzhiyun install_requires = [ 35*4882a593Smuzhiyun 'cached-property >= 1.2.0, < 2', 36*4882a593Smuzhiyun 'docopt >= 0.6.1, < 1', 37*4882a593Smuzhiyun- 'PyYAML >= 3.10, < 5', 38*4882a593Smuzhiyun+ 'PyYAML >= 3.10, < 6', 39*4882a593Smuzhiyun 'requests >= 2.20.0, < 3', 40*4882a593Smuzhiyun 'texttable >= 0.9.0, < 2', 41*4882a593Smuzhiyun 'websocket-client >= 0.32.0, < 1', 42*4882a593Smuzhiyun-- 43*4882a593Smuzhiyun2.20.1 44*4882a593Smuzhiyun 45