diff --git a/extras-requirements.txt b/extras-requirements.txt index 9c19c2463f8..15f04f5e77f 100644 --- a/extras-requirements.txt +++ b/extras-requirements.txt @@ -11,14 +11,11 @@ boto3~=1.9, <1.17.107 botocore>=1.20.106,<1.20.107 aiobotocore~=1.4.0 -# aioitertools 0.9 and above requires typing-extensions>4, which conflicts with kfp -aioitertools<0.9 s3fs~=2021.8.1 # https://github.com/Azure/azure-sdk-for-python/issues/24765#issuecomment-1150310498 msrest~=0.6.21 -# azure-core>=1.23.0 uses ParamSpec, and hence depends on typing_extensions>=4 -azure-core<1.23 -azure-storage-blob~=12.0 +azure-core~=1.23 +azure-storage-blob~=12.13 adlfs~=2021.8.1 azure-identity~=1.5 azure-keyvault-secrets~=4.2 diff --git a/requirements.txt b/requirements.txt index 55d3d706deb..5f7d83e2e35 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,11 +7,11 @@ aiohttp~=3.8 # 8.1.0+ breaks dask/distributed versions older than 2022.04.0, see here - https://github.com/dask/distributed/pull/6018 click~=8.0.0 # fastapi 0.78.0 requires starlette 0.19.1 which requires typing_extensions>=3.10.0 -# kfp 1.8.1 requires typing-extensions>=3.7.4,<4 +# kfp 1.8.13 requires typing-extensions>=3.7.4,<5 # for some reason when installing mlrun on a venv that already had typing-extensions==3.7.4.3 it didn't upgrade it to # >=3.10.0 although it was installing starlette 0.19.1 # therefore adding it explictly -typing-extensions>=3.10.0,<4 +typing-extensions>=3.10.0,<5 # 3.0/3.2 iguazio system uses 1.0.1, but we needed >=1.6.0 to be compatible with k8s>=12.0 to fix scurity issue # since the sdk is still mark as beta (and not stable) I'm limiting to only patch changes kfp~=1.8.0 diff --git a/setup.py b/setup.py index 7a0b47ceb45..c85248d5105 100644 --- a/setup.py +++ b/setup.py @@ -81,13 +81,12 @@ def load_deps(path): "boto3~=1.9, <1.17.107", "botocore>=1.20.106,<1.20.107", "aiobotocore~=1.4.0", - "aioitertools<0.9", "s3fs~=2021.8.1", ], "azure-blob-storage": [ "msrest~=0.6.21", - "azure-storage-blob~=12.0", - "azure-core<1.23", + "azure-core~=1.23", + "azure-storage-blob~=12.13", "adlfs~=2021.8.1", ], "azure-key-vault": ["azure-identity~=1.5", "azure-keyvault-secrets~=4.2"], diff --git a/tests/test_requirements.py b/tests/test_requirements.py index 24fa84f9962..047bb747c11 100644 --- a/tests/test_requirements.py +++ b/tests/test_requirements.py @@ -81,10 +81,9 @@ def test_requirement_specifiers_convention(): "kfp": {"~=1.8.0"}, "botocore": {">=1.20.106,<1.20.107"}, "aiobotocore": {"~=1.4.0"}, - "aioitertools": {"<0.9"}, "storey": {"~=1.1.5"}, "bokeh": {"~=2.4, >=2.4.2"}, - "typing-extensions": {">=3.10.0,<4"}, + "typing-extensions": {">=3.10.0,<5"}, # These 2 are used in a tests that is purposed to test requirement without specifiers "faker": {""}, "python-dotenv": {""}, @@ -109,8 +108,8 @@ def test_requirement_specifiers_convention(): "numpy": {">=1.16.5, <1.23.0"}, "alembic": {"~=1.4,<1.6.0"}, "boto3": {"~=1.9, <1.17.107"}, - "azure-core": {"<1.23"}, - "azure-storage-blob": {"~=12.0, <12.7.0"}, + "azure-core": {"~=1.23"}, + "azure-storage-blob": {"~=12.13"}, "dask-ml": {"~=1.4,<1.9.0"}, "pyarrow": {">=1,<7"}, "nbclassic": {">=0.2.8"},