From ead42a3fb6ba04ee26be9718ca468e1ba127cca6 Mon Sep 17 00:00:00 2001 From: Jacob Lauzon Date: Wed, 12 Oct 2022 15:10:12 -0700 Subject: [PATCH 1/4] Add extra `aio` to Storage packages --- sdk/storage/azure-storage-blob/CHANGELOG.md | 1 + sdk/storage/azure-storage-blob/setup.py | 7 ++++++- sdk/storage/azure-storage-file-datalake/CHANGELOG.md | 1 + sdk/storage/azure-storage-file-datalake/setup.py | 7 ++++++- sdk/storage/azure-storage-file-share/CHANGELOG.md | 1 + sdk/storage/azure-storage-file-share/setup.py | 7 ++++++- sdk/storage/azure-storage-queue/CHANGELOG.md | 1 + sdk/storage/azure-storage-queue/setup.py | 7 ++++++- 8 files changed, 28 insertions(+), 4 deletions(-) diff --git a/sdk/storage/azure-storage-blob/CHANGELOG.md b/sdk/storage/azure-storage-blob/CHANGELOG.md index 9e451cc66453..058b2178a479 100644 --- a/sdk/storage/azure-storage-blob/CHANGELOG.md +++ b/sdk/storage/azure-storage-blob/CHANGELOG.md @@ -10,6 +10,7 @@ ### Other Changes - Added `typing-extensions>=4.0.1` as a dependency. +- Added extra dependency `aio` for installing optional async dependencies. Use `pip install azure-storage-blob[aio]` to install. ## 12.14.0 (2022-10-11) diff --git a/sdk/storage/azure-storage-blob/setup.py b/sdk/storage/azure-storage-blob/setup.py index cf35b6664ed3..772aa8380f3f 100644 --- a/sdk/storage/azure-storage-blob/setup.py +++ b/sdk/storage/azure-storage-blob/setup.py @@ -76,9 +76,14 @@ ]), python_requires=">=3.7", install_requires=[ - "azure-core<2.0.0,>=1.24.2", + "azure-core<2.0.0,>=1.26.0", "msrest>=0.7.1", "cryptography>=2.1.4", "typing-extensions>=4.0.1" ], + extras_require={ + "aio": [ + "azure-core[aio]<2.0.0,>=1.26.0", + ], + }, ) diff --git a/sdk/storage/azure-storage-file-datalake/CHANGELOG.md b/sdk/storage/azure-storage-file-datalake/CHANGELOG.md index 47daf1d4db15..d90fee4402e8 100644 --- a/sdk/storage/azure-storage-file-datalake/CHANGELOG.md +++ b/sdk/storage/azure-storage-file-datalake/CHANGELOG.md @@ -10,6 +10,7 @@ ### Other Changes - Added `typing-extensions>=4.0.1` as a dependency. +- Added extra dependency `aio` for installing optional async dependencies. Use `pip install azure-storage-file-datalake[aio]` to install. ## 12.9.0 (2022-10-11) diff --git a/sdk/storage/azure-storage-file-datalake/setup.py b/sdk/storage/azure-storage-file-datalake/setup.py index 3b6526da5a3f..6ac4a69df4c6 100644 --- a/sdk/storage/azure-storage-file-datalake/setup.py +++ b/sdk/storage/azure-storage-file-datalake/setup.py @@ -75,9 +75,14 @@ ]), python_requires=">=3.7", install_requires=[ - "azure-core<2.0.0,>=1.24.2", + "azure-core<2.0.0,>=1.26.0", "msrest>=0.7.1", "azure-storage-blob<13.0.0,>=12.14.0", "typing-extensions>=4.0.1" ], + extras_require={ + "aio": [ + "azure-core[aio]<2.0.0,>=1.26.0", + ], + }, ) diff --git a/sdk/storage/azure-storage-file-share/CHANGELOG.md b/sdk/storage/azure-storage-file-share/CHANGELOG.md index 50a87716fc53..cfb5df2c0dae 100644 --- a/sdk/storage/azure-storage-file-share/CHANGELOG.md +++ b/sdk/storage/azure-storage-file-share/CHANGELOG.md @@ -10,6 +10,7 @@ ### Other Changes - Added `typing-extensions>=4.0.1` as a dependency. +- Added extra dependency `aio` for installing optional async dependencies. Use `pip install azure-storage-file-share[aio]` to install. ## 12.10.0 (2022-10-11) diff --git a/sdk/storage/azure-storage-file-share/setup.py b/sdk/storage/azure-storage-file-share/setup.py index 61abc8b51691..34cadea3636f 100644 --- a/sdk/storage/azure-storage-file-share/setup.py +++ b/sdk/storage/azure-storage-file-share/setup.py @@ -63,9 +63,14 @@ ]), python_requires=">=3.7", install_requires=[ - "azure-core<2.0.0,>=1.24.2", + "azure-core<2.0.0,>=1.26.0", "msrest>=0.7.1", "cryptography>=2.1.4", "typing-extensions>=4.0.1" ], + extras_require={ + "aio": [ + "azure-core[aio]<2.0.0,>=1.26.0", + ], + }, ) diff --git a/sdk/storage/azure-storage-queue/CHANGELOG.md b/sdk/storage/azure-storage-queue/CHANGELOG.md index dec36c268cd6..56622707e397 100644 --- a/sdk/storage/azure-storage-queue/CHANGELOG.md +++ b/sdk/storage/azure-storage-queue/CHANGELOG.md @@ -10,6 +10,7 @@ ### Other Changes - Added `typing-extensions>=4.0.1` as a dependency. +- Added extra dependency `aio` for installing optional async dependencies. Use `pip install azure-storage-queue[aio]` to install. ## 12.5.0 (2022-10-11) diff --git a/sdk/storage/azure-storage-queue/setup.py b/sdk/storage/azure-storage-queue/setup.py index f090b3cdf6b8..a43afd1d2630 100644 --- a/sdk/storage/azure-storage-queue/setup.py +++ b/sdk/storage/azure-storage-queue/setup.py @@ -66,9 +66,14 @@ ]), python_requires=">=3.7", install_requires=[ - "azure-core<2.0.0,>=1.24.2", + "azure-core<2.0.0,>=1.26.0", "msrest>=0.7.1", "cryptography>=2.1.4", "typing-extensions>=4.0.1" ], + extras_require={ + "aio": [ + "azure-core[aio]<2.0.0,>=1.26.0", + ], + }, ) From 61e16bfb660f787eeb7f633d5d21a5c948ac48c7 Mon Sep 17 00:00:00 2001 From: Jacob Lauzon Date: Wed, 12 Oct 2022 15:16:01 -0700 Subject: [PATCH 2/4] shared_requirements --- shared_requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/shared_requirements.txt b/shared_requirements.txt index 45d9ca0fadcf..6b45e81862ef 100644 --- a/shared_requirements.txt +++ b/shared_requirements.txt @@ -159,17 +159,17 @@ yarl<2.0,>=1.0 #override azure-search-documents azure-core<2.0.0,>=1.19.0 #override azure-ai-formrecognizer azure-core<2.0.0,>=1.23.0 #override azure-ai-formrecognizer typing-extensions>=4.0.1 -#override azure-storage-blob azure-core<2.0.0,>=1.24.2 +#override azure-storage-blob azure-core<2.0.0,>=1.26.0 #override azure-storage-blob msrest>=0.7.1 #override azure-storage-blob typing-extensions>=4.0.1 #override azure-storage-blob-changefeed azure-storage-blob>=12.5.0,<13.0.0 -#override azure-storage-queue azure-core<2.0.0,>=1.24.2 +#override azure-storage-queue azure-core<2.0.0,>=1.26.0 #override azure-storage-queue msrest>=0.7.1 #override azure-storage-queue typing-extensions>=4.0.1 -#override azure-storage-file-share azure-core<2.0.0,>=1.24.2 +#override azure-storage-file-share azure-core<2.0.0,>=1.26.0 #override azure-storage-file-share msrest>=0.7.1 #override azure-storage-file-share typing-extensions>=4.0.1 -#override azure-storage-file-datalake azure-core<2.0.0,>=1.24.2 +#override azure-storage-file-datalake azure-core<2.0.0,>=1.26.0 #override azure-storage-file-datalake msrest>=0.7.1 #override azure-storage-file-datalake azure-storage-blob<13.0.0,>=12.14.0 #override azure-storage-file-datalake typing-extensions>=4.0.1 From d8a50064db729804bc1e8a9ce5b042e988fcca2f Mon Sep 17 00:00:00 2001 From: Jacob Lauzon Date: Wed, 12 Oct 2022 17:51:35 -0700 Subject: [PATCH 3/4] More shared_requirements --- shared_requirements.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/shared_requirements.txt b/shared_requirements.txt index 6b45e81862ef..7077a8c4e0ce 100644 --- a/shared_requirements.txt +++ b/shared_requirements.txt @@ -160,16 +160,20 @@ yarl<2.0,>=1.0 #override azure-ai-formrecognizer azure-core<2.0.0,>=1.23.0 #override azure-ai-formrecognizer typing-extensions>=4.0.1 #override azure-storage-blob azure-core<2.0.0,>=1.26.0 +#override azure-storage-blob azure-core[aio]<2.0.0,>=1.26.0 #override azure-storage-blob msrest>=0.7.1 #override azure-storage-blob typing-extensions>=4.0.1 #override azure-storage-blob-changefeed azure-storage-blob>=12.5.0,<13.0.0 #override azure-storage-queue azure-core<2.0.0,>=1.26.0 +#override azure-storage-queue azure-core[aio]<2.0.0,>=1.26.0 #override azure-storage-queue msrest>=0.7.1 #override azure-storage-queue typing-extensions>=4.0.1 #override azure-storage-file-share azure-core<2.0.0,>=1.26.0 +#override azure-storage-file-share azure-core[aio]<2.0.0,>=1.26.0 #override azure-storage-file-share msrest>=0.7.1 #override azure-storage-file-share typing-extensions>=4.0.1 #override azure-storage-file-datalake azure-core<2.0.0,>=1.26.0 +#override azure-storage-file-datalake azure-core[aio]<2.0.0,>=1.26.0 #override azure-storage-file-datalake msrest>=0.7.1 #override azure-storage-file-datalake azure-storage-blob<13.0.0,>=12.14.0 #override azure-storage-file-datalake typing-extensions>=4.0.1 From 8005f41c496e524047198cc97a35c77f223de486 Mon Sep 17 00:00:00 2001 From: Jacob Lauzon Date: Thu, 13 Oct 2022 16:06:59 -0700 Subject: [PATCH 4/4] Fix merge --- shared_requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/shared_requirements.txt b/shared_requirements.txt index e2e90ab0f5ec..4589f60a4af9 100644 --- a/shared_requirements.txt +++ b/shared_requirements.txt @@ -169,6 +169,7 @@ yarl<2.0,>=1.0 #override azure-storage-file-share azure-core<2.0.0,>=1.26.0 #override azure-storage-file-share azure-core[aio]<2.0.0,>=1.26.0 #override azure-storage-file-share typing-extensions>=4.0.1 +#override azure-storage-file-datalake azure-storage-blob<13.0.0,>=12.14.0 #override azure-storage-file-datalake azure-core<2.0.0,>=1.26.0 #override azure-storage-file-datalake azure-core[aio]<2.0.0,>=1.26.0 #override azure-storage-file-datalake typing-extensions>=4.0.1