[Requirements] Fix conflicts (#858)

dockerfiles/models/requirements.txt

@@ -8,7 +8,7 @@ dask-ml~=1.4
 dask[complete]~=2.12
 # see main requirements.txt for reasoning the resrictions
 distributed>=2.23, <3
-fsspec>=0.8.2, <=0.8.7
+fsspec~=0.9.0
 gnureadline~=8.0
 kubernetes~=11.0
 lifelines~=0.25.0

requirements.txt

@@ -47,9 +47,7 @@ kubernetes~=11.0
 #  separating the SDK and API code) (referring to humanfriendly and fastapi)
 humanfriendly~=8.2
 fastapi~=0.62.0
-# adlfs 0.7.0 has fsspec>=0.8.2, <=0.8.7, replicating it here since v3iofs 0.1.6 has fsspec>=0.6.2 which installs 0.9.0
-# which is incompatible
-fsspec>=0.8.2, <=0.8.7
+fsspec~=0.9.0
 v3iofs~=0.1.5
 # 3.4 and above failed builidng in some images - see https://github.com/pyca/cryptography/issues/5771
 cryptography~=3.3.2

setup.py

@@ -57,12 +57,9 @@ def load_deps(path):
 # NOTE: These are tested in `automation/package_test/test.py` If
 # you modify these, make sure to change the corresponding line there.
 extras_require = {
-    # from 1.16.53 it requires botocore<1.20.0,>=1.19.53 which conflicts with s3fs 0.5.2 that has aiobotocore>=1.0.1
-    # which resolves to 1.2.1 which has botocore >=1.19.52,<1.19.53
-    # boto3 1.16.53 has botocore<1.20.0, >=1.19.53, so we must add botocore explictly
-    "s3": ["boto3~=1.9, <1.16.53", "botocore>=1.19.52, <1.19.53", "s3fs~=0.5.0"],
+    "s3": ["boto3~=1.9", "s3fs~=0.5.0"],
     # <12.7.0 from adlfs 0.6.3
-    "azure-blob-storage": ["azure-storage-blob~=12.0, <12.7.0", "adlfs~=0.7.0"],
+    "azure-blob-storage": ["azure-storage-blob~=12.0, <12.7.0", "adlfs~=0.7.1"],
     "azure-key-vault": ["azure-identity~=1.5", "azure-keyvault-secrets~=4.2"],
 }
 extras_require["complete"] = sorted(