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