Skip to content

Commit 13f6101

Browse files
authored
Merge pull request #2902 from mroutis/fix-2570
setup: fix compatibility errors between dependencies
2 parents d6ecad0 + 2237ab6 commit 13f6101

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

setup.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ def run(self):
5252

5353

5454
install_requires = [
55+
"python-dateutil<2.8.1,>=2.1", # Consolidates azure-blob-storage and boto3
5556
"ply>=3.9", # See https://github.com/pyinstaller/pyinstaller/issues/1945
5657
"configparser>=3.5.0",
5758
"future>=0.16.0",
@@ -72,7 +73,7 @@ def run(self):
7273
"treelib>=1.5.5",
7374
"inflect>=2.1.0",
7475
"humanize>=0.5.1",
75-
"PyYAML>=5.1.2",
76+
"PyYAML>=5.1.2,<5.2", # Compatibility with awscli
7677
"ruamel.yaml>=0.16.1",
7778
"funcy>=1.14",
7879
"pathspec>=0.6.0",
@@ -95,7 +96,7 @@ def run(self):
9596
# https://github.com/gsuitedevs/PyDrive/pull/180 into pydrive's master,
9697
# usage of google-api-python-client can be removed from DVC.
9798
gdrive = ["pydrive==1.3.1", "google-api-python-client>=1.2"]
98-
s3 = ["boto3==1.9.115"]
99+
s3 = ["boto3>=1.9.201"]
99100
azure = ["azure-storage-blob==2.1.0"]
100101
oss = ["oss2==2.6.1"]
101102
ssh = ["paramiko>=2.5.0"]
@@ -125,7 +126,7 @@ def run(self):
125126
"flaky>=3.5.3",
126127
"mock>=3.0.0",
127128
"xmltodict>=0.11.0",
128-
"awscli==1.16.266",
129+
"awscli>=1.16.297",
129130
"google-compute-engine==2.8.13",
130131
"Pygments", # required by collective.checkdocs,
131132
"collective.checkdocs",

0 commit comments

Comments
 (0)