From 4fd701317ba9fb454702acf05d6391e600b2a1c3 Mon Sep 17 00:00:00 2001
From: "Mr. Outis" <mroutis@protonmail.com>
Date: Thu, 5 Dec 2019 13:05:18 -0600
Subject: [PATCH 1/2] setup: fix compatibility errors between dependencies

fix #2570
---
 setup.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index b23d269db7..3b838f5f20 100644
--- a/setup.py
+++ b/setup.py
@@ -52,6 +52,7 @@ def run(self):
 
 
 install_requires = [
+    "python-dateutil<2.8.1,>=2.1",  # Compatibility with botocore
     "ply>=3.9",  # See https://github.com/pyinstaller/pyinstaller/issues/1945
     "configparser>=3.5.0",
     "future>=0.16.0",
@@ -72,7 +73,7 @@ def run(self):
     "treelib>=1.5.5",
     "inflect>=2.1.0",
     "humanize>=0.5.1",
-    "PyYAML>=5.1.2",
+    "PyYAML==5.1.2",  # Compatibility with awscli requiring (< 5.2)
     "ruamel.yaml>=0.16.1",
     "funcy>=1.14",
     "pathspec>=0.6.0",
@@ -95,7 +96,7 @@ def run(self):
 # https://github.com/gsuitedevs/PyDrive/pull/180 into pydrive's master,
 # usage of google-api-python-client can be removed from DVC.
 gdrive = ["pydrive==1.3.1", "google-api-python-client>=1.2"]
-s3 = ["boto3==1.9.115"]
+s3 = ["boto3>=1.9.201"]
 azure = ["azure-storage-blob==2.1.0"]
 oss = ["oss2==2.6.1"]
 ssh = ["paramiko>=2.5.0"]
@@ -125,7 +126,7 @@ def run(self):
     "flaky>=3.5.3",
     "mock>=3.0.0",
     "xmltodict>=0.11.0",
-    "awscli==1.16.266",
+    "awscli>=1.16.297",
     "google-compute-engine==2.8.13",
     "Pygments",  # required by collective.checkdocs,
     "collective.checkdocs",

From 2237ab6a51ed086dcb3b159b7ed8d7db64877526 Mon Sep 17 00:00:00 2001
From: "Mr. Outis" <mroutis@protonmail.com>
Date: Thu, 5 Dec 2019 17:47:01 -0600
Subject: [PATCH 2/2] setup: fix only mayor minor version for pyyaml

---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 3b838f5f20..08324a0be4 100644
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,7 @@ def run(self):
 
 
 install_requires = [
-    "python-dateutil<2.8.1,>=2.1",  # Compatibility with botocore
+    "python-dateutil<2.8.1,>=2.1",  # Consolidates azure-blob-storage and boto3
     "ply>=3.9",  # See https://github.com/pyinstaller/pyinstaller/issues/1945
     "configparser>=3.5.0",
     "future>=0.16.0",
@@ -73,7 +73,7 @@ def run(self):
     "treelib>=1.5.5",
     "inflect>=2.1.0",
     "humanize>=0.5.1",
-    "PyYAML==5.1.2",  # Compatibility with awscli requiring (< 5.2)
+    "PyYAML>=5.1.2,<5.2",  # Compatibility with awscli
     "ruamel.yaml>=0.16.1",
     "funcy>=1.14",
     "pathspec>=0.6.0",