From ec9d5131295b94d537782f1ee1721693c69b73b7 Mon Sep 17 00:00:00 2001 From: praveenkuttappan <55455725+praveenkuttappan@users.noreply.github.com> Date: Wed, 13 Nov 2019 23:22:06 -0800 Subject: [PATCH 1/3] Nightly build is failing due version conflict between storage datalake and storage blob --- sdk/storage/azure-storage-file-datalake/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/storage/azure-storage-file-datalake/setup.py b/sdk/storage/azure-storage-file-datalake/setup.py index 8a7d85f1d50b..beb6fdbd4edd 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.0.0", "msrest>=0.6.10", - "azure-storage-blob~=12.0.0" + "azure-storage-blob>=12.0.0" ], extras_require={ ":python_version<'3.0'": ['futures', 'azure-storage-nspkg<4.0.0,>=3.0.0'], From efa6b59f3a70cb38f3ba069620b73da6a0593ecd Mon Sep 17 00:00:00 2001 From: praveenkuttappan <55455725+praveenkuttappan@users.noreply.github.com> Date: Thu, 14 Nov 2019 09:34:10 -0800 Subject: [PATCH 2/3] review changes --- sdk/storage/azure-storage-file-datalake/setup.py | 2 +- shared_requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/storage/azure-storage-file-datalake/setup.py b/sdk/storage/azure-storage-file-datalake/setup.py index beb6fdbd4edd..5142af761746 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.0.0", "msrest>=0.6.10", - "azure-storage-blob>=12.0.0" + "azure-storage-blob<13.0.0,>=12.0.0" ], extras_require={ ":python_version<'3.0'": ['futures', 'azure-storage-nspkg<4.0.0,>=3.0.0'], diff --git a/shared_requirements.txt b/shared_requirements.txt index 6eb79669539b..a8e71c078891 100644 --- a/shared_requirements.txt +++ b/shared_requirements.txt @@ -110,7 +110,7 @@ six>=1.6 #override azure-storage-queue msrest>=0.6.10 #override azure-storage-file-share msrest>=0.6.10 #override azure-storage-file-datalake msrest>=0.6.10 -#override azure-storage-file-datalake azure-storage-blob~=12.0.0 +#override azure-storage-file-datalake azure-storage-blob<13.0.0,>=12.0.0 opencensus>=0.6.0 opencensus-ext-threading opencensus-ext-azure>=0.3.1 From 03fdad908b2472fd77bc05ee1c5a74977ea92ae4 Mon Sep 17 00:00:00 2001 From: praveenkuttappan <55455725+praveenkuttappan@users.noreply.github.com> Date: Thu, 14 Nov 2019 11:47:50 -0800 Subject: [PATCH 3/3] Version dependency with azure-storage-blob to 12.0 --- sdk/storage/azure-storage-file-datalake/setup.py | 2 +- shared_requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/storage/azure-storage-file-datalake/setup.py b/sdk/storage/azure-storage-file-datalake/setup.py index 5142af761746..94b5e3bc2e1a 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.0.0", "msrest>=0.6.10", - "azure-storage-blob<13.0.0,>=12.0.0" + "azure-storage-blob~=12.0" ], extras_require={ ":python_version<'3.0'": ['futures', 'azure-storage-nspkg<4.0.0,>=3.0.0'], diff --git a/shared_requirements.txt b/shared_requirements.txt index a8e71c078891..aa7364da3602 100644 --- a/shared_requirements.txt +++ b/shared_requirements.txt @@ -110,7 +110,7 @@ six>=1.6 #override azure-storage-queue msrest>=0.6.10 #override azure-storage-file-share msrest>=0.6.10 #override azure-storage-file-datalake msrest>=0.6.10 -#override azure-storage-file-datalake azure-storage-blob<13.0.0,>=12.0.0 +#override azure-storage-file-datalake azure-storage-blob~=12.0 opencensus>=0.6.0 opencensus-ext-threading opencensus-ext-azure>=0.3.1