Allow 5.1 of PyYAML

tangaowei · Jun 11, 2019 · 73b6ece · 73b6ece
1 parent 8024933
commit 73b6ece
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -8,6 +8,7 @@ requires-dist =
         colorama>=0.2.5,<=0.3.9
         docutils>=0.10
         rsa>=3.1.2,<=3.5.0
-        PyYAML>=3.10,<=3.13
+        PyYAML>=3.10,<=3.13; python_version=="2.6"
+        PyYAML>=3.10,<=5.1;python_version!="2.6"
         s3transfer>=0.2.0,<0.3.0
         argparse>=1.1; python_version=="2.6"
diff --git a/setup.py b/setup.py
@@ -27,15 +27,20 @@ def find_version(*file_paths):
             'colorama>=0.2.5,<=0.3.9',
             'docutils>=0.10',
             'rsa>=3.1.2,<=3.5.0',
-            's3transfer>=0.2.0,<0.3.0',
-            'PyYAML>=3.10,<=3.13']
+            's3transfer>=0.2.0,<0.3.0']
 
 
 if sys.version_info[:2] == (2, 6):
     # For python2.6 we have to require argparse since it
     # was not in stdlib until 2.7.
     requires.append('argparse>=1.1')
 
+    # For Python 2.6, we have to require a different verion of PyYAML since the latest
+    # versions dropped support for Python 2.6.
+    requires.append('PyYAML>=3.10,<=3.13')
+else:
+    requires.append('PyYAML>=3.10,<=5.1')
+
 
 setup_options = dict(
     name='awscli',