From e1374bc6b7767948d67d48a538a0505973cd84e3 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Wed, 16 Sep 2020 17:23:00 -0700 Subject: [PATCH 1/5] bump dependency versions --- sdk/storage/azure-storage-blob-changefeed/setup.py | 2 +- sdk/storage/azure-storage-file-datalake/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/storage/azure-storage-blob-changefeed/setup.py b/sdk/storage/azure-storage-blob-changefeed/setup.py index 2720e65c85df..41d5ce10b7ba 100644 --- a/sdk/storage/azure-storage-blob-changefeed/setup.py +++ b/sdk/storage/azure-storage-blob-changefeed/setup.py @@ -88,7 +88,7 @@ 'azure.storage.blob.changefeed', ], install_requires=[ - "azure-storage-blob~=12.5.0", + "azure-storage-blob>=12.5.0,<2.0.0", ], extras_require={ ":python_version<'3.0'": ['futures', 'azure-storage-nspkg<4.0.0,>=3.0.0'], diff --git a/sdk/storage/azure-storage-file-datalake/setup.py b/sdk/storage/azure-storage-file-datalake/setup.py index c6afe2ba1c74..9a0a36b5f7aa 100644 --- a/sdk/storage/azure-storage-file-datalake/setup.py +++ b/sdk/storage/azure-storage-file-datalake/setup.py @@ -93,7 +93,7 @@ install_requires=[ "azure-core<2.0.0,>=1.6.0", "msrest>=0.6.10", - "azure-storage-blob~=12.4.0" + "azure-storage-blob>=12.4.0,<2.0.0", ], extras_require={ ":python_version<'3.0'": ['futures', 'azure-storage-nspkg<4.0.0,>=3.0.0'], From 32bb2748c078c3387f2dc9ffcbbc35b3254e556d Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Wed, 16 Sep 2020 17:28:44 -0700 Subject: [PATCH 2/5] update upper bound appropriately --- sdk/storage/azure-storage-blob-changefeed/setup.py | 4 ++-- sdk/storage/azure-storage-file-datalake/setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/storage/azure-storage-blob-changefeed/setup.py b/sdk/storage/azure-storage-blob-changefeed/setup.py index 41d5ce10b7ba..97d51a9cd0c8 100644 --- a/sdk/storage/azure-storage-blob-changefeed/setup.py +++ b/sdk/storage/azure-storage-blob-changefeed/setup.py @@ -28,7 +28,7 @@ import azure try: - ver = azure.__version__ + ver = azure.__version__ raise Exception( 'This package is incompatible with azure=={}. '.format(ver) + 'Uninstall it with "pip uninstall azure".' @@ -88,7 +88,7 @@ 'azure.storage.blob.changefeed', ], install_requires=[ - "azure-storage-blob>=12.5.0,<2.0.0", + "azure-storage-blob>=12.5.0,<13.0.0", ], extras_require={ ":python_version<'3.0'": ['futures', 'azure-storage-nspkg<4.0.0,>=3.0.0'], diff --git a/sdk/storage/azure-storage-file-datalake/setup.py b/sdk/storage/azure-storage-file-datalake/setup.py index 9a0a36b5f7aa..f13a20cbb282 100644 --- a/sdk/storage/azure-storage-file-datalake/setup.py +++ b/sdk/storage/azure-storage-file-datalake/setup.py @@ -93,7 +93,7 @@ install_requires=[ "azure-core<2.0.0,>=1.6.0", "msrest>=0.6.10", - "azure-storage-blob>=12.4.0,<2.0.0", + "azure-storage-blob>=12.4.0,<13.0.0", ], extras_require={ ":python_version<'3.0'": ['futures', 'azure-storage-nspkg<4.0.0,>=3.0.0'], From 0823e71b003b038404e4cf1a948fe055e6924602 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Wed, 16 Sep 2020 17:29:58 -0700 Subject: [PATCH 3/5] revert unecessary changes --- sdk/storage/azure-storage-blob-changefeed/setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/storage/azure-storage-blob-changefeed/setup.py b/sdk/storage/azure-storage-blob-changefeed/setup.py index 97d51a9cd0c8..3fb547338838 100644 --- a/sdk/storage/azure-storage-blob-changefeed/setup.py +++ b/sdk/storage/azure-storage-blob-changefeed/setup.py @@ -28,7 +28,7 @@ import azure try: - ver = azure.__version__ + ver = azure.__version__ raise Exception( 'This package is incompatible with azure=={}. '.format(ver) + 'Uninstall it with "pip uninstall azure".' @@ -88,7 +88,7 @@ 'azure.storage.blob.changefeed', ], install_requires=[ - "azure-storage-blob>=12.5.0,<13.0.0", + "azure-storage-blob>=12.5.0,<13.0.0", ], extras_require={ ":python_version<'3.0'": ['futures', 'azure-storage-nspkg<4.0.0,>=3.0.0'], From f3592a676e1ead28d56ca5acc2eacea59d508292 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Wed, 16 Sep 2020 17:31:18 -0700 Subject: [PATCH 4/5] updated formatting to eliminate trailing comma. these setup.py don't do that --- sdk/storage/azure-storage-blob-changefeed/setup.py | 2 +- sdk/storage/azure-storage-file-datalake/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/storage/azure-storage-blob-changefeed/setup.py b/sdk/storage/azure-storage-blob-changefeed/setup.py index 3fb547338838..269bc0c98104 100644 --- a/sdk/storage/azure-storage-blob-changefeed/setup.py +++ b/sdk/storage/azure-storage-blob-changefeed/setup.py @@ -88,7 +88,7 @@ 'azure.storage.blob.changefeed', ], install_requires=[ - "azure-storage-blob>=12.5.0,<13.0.0", + "azure-storage-blob>=12.5.0,<13.0.0" ], extras_require={ ":python_version<'3.0'": ['futures', 'azure-storage-nspkg<4.0.0,>=3.0.0'], diff --git a/sdk/storage/azure-storage-file-datalake/setup.py b/sdk/storage/azure-storage-file-datalake/setup.py index f13a20cbb282..4ee0b328448c 100644 --- a/sdk/storage/azure-storage-file-datalake/setup.py +++ b/sdk/storage/azure-storage-file-datalake/setup.py @@ -93,7 +93,7 @@ install_requires=[ "azure-core<2.0.0,>=1.6.0", "msrest>=0.6.10", - "azure-storage-blob>=12.4.0,<13.0.0", + "azure-storage-blob>=12.4.0,<13.0.0" ], extras_require={ ":python_version<'3.0'": ['futures', 'azure-storage-nspkg<4.0.0,>=3.0.0'], From a85258b34ec1a65c651a7088e5c74a55a3cf1d37 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Wed, 16 Sep 2020 18:30:33 -0700 Subject: [PATCH 5/5] bump shared_requirements --- shared_requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shared_requirements.txt b/shared_requirements.txt index eb721e071c51..54dee7e26185 100644 --- a/shared_requirements.txt +++ b/shared_requirements.txt @@ -137,13 +137,13 @@ avro<2.0.0,>=1.10.0 #override azure-ai-formrecognizer azure-core<2.0.0,>=1.6.0 #override azure-storage-blob azure-core<2.0.0,>=1.6.0 #override azure-storage-blob msrest>=0.6.10 -#override azure-storage-blob-changefeed azure-storage-blob~=12.5.0 +#override azure-storage-blob-changefeed azure-storage-blob>=12.5.0,<13.0.0 #override azure-storage-queue azure-core<2.0.0,>=1.6.0 #override azure-storage-queue msrest>=0.6.10 #override azure-storage-file-share msrest>=0.6.10 #override azure-storage-file-datalake azure-core<2.0.0,>=1.6.0 #override azure-storage-file-datalake msrest>=0.6.10 -#override azure-storage-file-datalake azure-storage-blob~=12.4.0 +#override azure-storage-file-datalake azure-storage-blob>=12.4.0,<13.0.0 opencensus>=0.6.0 opencensus-ext-threading opencensus-ext-azure>=0.3.1