From c512063795fd027df89221b8afed68fde8ba48de Mon Sep 17 00:00:00 2001 From: Rakshith Bhyravabhotla Date: Fri, 8 May 2020 16:47:33 -0700 Subject: [PATCH 1/7] Deprecate Azure Storage --- sdk/storage/azure-storage/CHANGELOG.md | 3 ++ sdk/storage/azure-storage/README.md | 17 ++++++ sdk/storage/azure-storage/sdk_packaging.toml | 2 + sdk/storage/azure-storage/setup.py | 55 ++++++++++++++++++++ setup.py | 2 +- 5 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 sdk/storage/azure-storage/CHANGELOG.md create mode 100644 sdk/storage/azure-storage/README.md create mode 100644 sdk/storage/azure-storage/sdk_packaging.toml create mode 100644 sdk/storage/azure-storage/setup.py diff --git a/sdk/storage/azure-storage/CHANGELOG.md b/sdk/storage/azure-storage/CHANGELOG.md new file mode 100644 index 000000000000..a8c38e549fba --- /dev/null +++ b/sdk/storage/azure-storage/CHANGELOG.md @@ -0,0 +1,3 @@ +# Disclaimer + +Starting with v0.37, this package cannot be installed anymore, please install individual packages. diff --git a/sdk/storage/azure-storage/README.md b/sdk/storage/azure-storage/README.md new file mode 100644 index 000000000000..ea9f0d533597 --- /dev/null +++ b/sdk/storage/azure-storage/README.md @@ -0,0 +1,17 @@ +# Microsoft Azure Storage SDK for Python + +This package was the Microsoft Azure Storage bundle. + +Starting with v0.37, this package is deprecated. Please install the service specific packages prefixed by `azure-storgae` needed for your application. + +The complete list of available packages can be found at: +https://aka.ms/azsdk/python/all + +Here's a non-exhaustive list of common packages: + +- [azure-storage-blob](https://pypi.org/project/azure-storage-blob) : Blob storage client +- [azure-storage-file-share](https://pypi.org/project/azure-storage-file-share) : Storage file share client +- [azure-storage-file-datalake](https://pypi.org/project/azure-storage-file-datalake) : ADLS Gen2 client +- [azure-storage-queue](https://pypi.org/project/azure-storage-queue): Queue storage client + +![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure%2FREADME.png) diff --git a/sdk/storage/azure-storage/sdk_packaging.toml b/sdk/storage/azure-storage/sdk_packaging.toml new file mode 100644 index 000000000000..e7687fdae93b --- /dev/null +++ b/sdk/storage/azure-storage/sdk_packaging.toml @@ -0,0 +1,2 @@ +[packaging] +auto_update = false \ No newline at end of file diff --git a/sdk/storage/azure-storage/setup.py b/sdk/storage/azure-storage/setup.py new file mode 100644 index 000000000000..8b979355fd81 --- /dev/null +++ b/sdk/storage/azure-storage/setup.py @@ -0,0 +1,55 @@ +#!/usr/bin/env python + +#------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +#-------------------------------------------------------------------------- + +from setuptools import setup +import sys + + +message = """ + +Starting with v0.37, the 'azure-storage' meta-package is deprecated and cannot be installed anymore. +Please install the service specific packages prefixed by `azure` needed for your application. + +The complete list of available packages can be found at: +https://aka.ms/azsdk/python/all + +Here's a non-exhaustive list of common packages: + +- [azure-storage-blob](https://pypi.org/project/azure-storage-blob) : Blob storage client +- [azure-storage-file-share](https://pypi.org/project/azure-storage-file-share) : Storage file share client +- [azure-storage-file-datalake](https://pypi.org/project/azure-storage-file-datalake) : ADLS Gen2 client +- [azure-storage-queue](https://pypi.org/project/azure-storage-queue): Queue storage client +""" + +if "sdist" in sys.argv: + setup( + name='azure-storage', + version='0.37', + description='Microsoft Azure Storage SDK for Python', + long_description=open('README.md', 'r').read(), + long_description_content_type='text/markdown', + license='MIT License', + author='Microsoft Corporation', + author_email='azpysdkhelp@microsoft.com', + url='https://github.com/Azure/azure-sdk-for-python', + classifiers=[ + 'Development Status :: 7 - Inactive', + 'Programming Language :: Python', + 'Programming Language :: Python :: 2', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', + 'License :: OSI Approved :: MIT License', + ], + zip_safe=False, + ) +else: + raise RuntimeError(message) diff --git a/setup.py b/setup.py index 50e0cea8793b..efff3db4dc06 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ nspkg_packages.sort(key = lambda x: len([c for c in x if c == '-'])) # Meta-packages to ignore -meta_package = ['azure-keyvault', 'azure-mgmt', 'azure'] +meta_package = ['azure-keyvault', 'azure-mgmt', 'azure', 'azure-storage'] # content packages are packages that are not meta nor nspkg content_package = sorted([p for p in packages.keys() if p not in meta_package+nspkg_packages]) From 56323375cb12189cb4938ffedaa8fc581bc61263 Mon Sep 17 00:00:00 2001 From: Rakshith Bhyravabhotla Date: Fri, 8 May 2020 16:48:50 -0700 Subject: [PATCH 2/7] version --- sdk/storage/azure-storage/CHANGELOG.md | 2 +- sdk/storage/azure-storage/README.md | 2 +- sdk/storage/azure-storage/setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/storage/azure-storage/CHANGELOG.md b/sdk/storage/azure-storage/CHANGELOG.md index a8c38e549fba..2603505be4a5 100644 --- a/sdk/storage/azure-storage/CHANGELOG.md +++ b/sdk/storage/azure-storage/CHANGELOG.md @@ -1,3 +1,3 @@ # Disclaimer -Starting with v0.37, this package cannot be installed anymore, please install individual packages. +Starting with v0.37.0, this package cannot be installed anymore, please install individual packages. diff --git a/sdk/storage/azure-storage/README.md b/sdk/storage/azure-storage/README.md index ea9f0d533597..9ae0ff82c856 100644 --- a/sdk/storage/azure-storage/README.md +++ b/sdk/storage/azure-storage/README.md @@ -2,7 +2,7 @@ This package was the Microsoft Azure Storage bundle. -Starting with v0.37, this package is deprecated. Please install the service specific packages prefixed by `azure-storgae` needed for your application. +Starting with v0.37.0, this package is deprecated. Please install the service specific packages prefixed by `azure-storgae` needed for your application. The complete list of available packages can be found at: https://aka.ms/azsdk/python/all diff --git a/sdk/storage/azure-storage/setup.py b/sdk/storage/azure-storage/setup.py index 8b979355fd81..0c03500c27c3 100644 --- a/sdk/storage/azure-storage/setup.py +++ b/sdk/storage/azure-storage/setup.py @@ -12,7 +12,7 @@ message = """ -Starting with v0.37, the 'azure-storage' meta-package is deprecated and cannot be installed anymore. +Starting with v0.37.0, the 'azure-storage' meta-package is deprecated and cannot be installed anymore. Please install the service specific packages prefixed by `azure` needed for your application. The complete list of available packages can be found at: From 405f8c0638143be0111a6ea4b7fab1a6dd926121 Mon Sep 17 00:00:00 2001 From: Rakshith Bhyravabhotla Date: Fri, 8 May 2020 16:51:25 -0700 Subject: [PATCH 3/7] Apply suggestions from code review --- sdk/storage/azure-storage/sdk_packaging.toml | 2 +- sdk/storage/azure-storage/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/storage/azure-storage/sdk_packaging.toml b/sdk/storage/azure-storage/sdk_packaging.toml index e7687fdae93b..901bc8ccbfa6 100644 --- a/sdk/storage/azure-storage/sdk_packaging.toml +++ b/sdk/storage/azure-storage/sdk_packaging.toml @@ -1,2 +1,2 @@ [packaging] -auto_update = false \ No newline at end of file +auto_update = false diff --git a/sdk/storage/azure-storage/setup.py b/sdk/storage/azure-storage/setup.py index 0c03500c27c3..31d1928b9ee1 100644 --- a/sdk/storage/azure-storage/setup.py +++ b/sdk/storage/azure-storage/setup.py @@ -29,7 +29,7 @@ if "sdist" in sys.argv: setup( name='azure-storage', - version='0.37', + version='0.37.0', description='Microsoft Azure Storage SDK for Python', long_description=open('README.md', 'r').read(), long_description_content_type='text/markdown', From c83716374ef689b3011166d97f156bf59ccde21a Mon Sep 17 00:00:00 2001 From: Rakshith Bhyravabhotla Date: Fri, 8 May 2020 16:55:56 -0700 Subject: [PATCH 4/7] update --- sdk/storage/azure-storage/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/storage/azure-storage/README.md b/sdk/storage/azure-storage/README.md index 9ae0ff82c856..65511ecb91df 100644 --- a/sdk/storage/azure-storage/README.md +++ b/sdk/storage/azure-storage/README.md @@ -2,16 +2,16 @@ This package was the Microsoft Azure Storage bundle. -Starting with v0.37.0, this package is deprecated. Please install the service specific packages prefixed by `azure-storgae` needed for your application. +Starting with v0.37.0, this package is deprecated. Please install the service specific packages prefixed by `azure-storage` needed for your application. The complete list of available packages can be found at: https://aka.ms/azsdk/python/all Here's a non-exhaustive list of common packages: -- [azure-storage-blob](https://pypi.org/project/azure-storage-blob) : Blob storage client +- [azure-storage-blob](https://pypi.org/project/azure-storage-blob) : Blob storage client - [azure-storage-file-share](https://pypi.org/project/azure-storage-file-share) : Storage file share client - [azure-storage-file-datalake](https://pypi.org/project/azure-storage-file-datalake) : ADLS Gen2 client - [azure-storage-queue](https://pypi.org/project/azure-storage-queue): Queue storage client -![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure%2FREADME.png) +![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-storage%2FREADME.png) From 3fbfc037ca41adff002335b9aa57dcaef22e4d5f Mon Sep 17 00:00:00 2001 From: Rakshith Bhyravabhotla Date: Fri, 8 May 2020 17:23:29 -0700 Subject: [PATCH 5/7] docs --- eng/.docsettings.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/.docsettings.yml b/eng/.docsettings.yml index 26cda64e1427..6ecdb0642780 100644 --- a/eng/.docsettings.yml +++ b/eng/.docsettings.yml @@ -83,6 +83,7 @@ known_content_issues: - ['sdk/storage/azure-storage-blob/swagger/README.md', '#4554'] - ['sdk/storage/azure-storage-file-datalake/swagger/README.md', '#4554'] - ['sdk/storage/azure-storage-file-share/swagger/README.md', '#4554'] + - ['sdk/storage/azure-storage/README.md', '#4554'] - ['sdk/storage/azure-storage-nspkg/README.rst', '#4554'] - ['sdk/storage/azure-storage-queue/swagger/README.md', '#4554'] - ['sdk/storage/README.md', '#4554'] From 719a2b7b44b4f7aa3fcc5e9bc525f8ca0555bc99 Mon Sep 17 00:00:00 2001 From: Rakshith Bhyravabhotla Date: Fri, 8 May 2020 17:32:00 -0700 Subject: [PATCH 6/7] omit --- scripts/devops_tasks/common_tasks.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/devops_tasks/common_tasks.py b/scripts/devops_tasks/common_tasks.py index b0215df2b287..f8a8473b5cdf 100644 --- a/scripts/devops_tasks/common_tasks.py +++ b/scripts/devops_tasks/common_tasks.py @@ -40,6 +40,7 @@ "azure-mgmt-scheduler", "azure", "azure-mgmt", + "azure-storage", ] MANAGEMENT_PACKAGE_IDENTIFIERS = [ "mgmt", From 5349e4b4689d3e44cb7f1c4b31170c7b78d807ab Mon Sep 17 00:00:00 2001 From: Rakshith Bhyravabhotla Date: Mon, 11 May 2020 13:12:28 -0700 Subject: [PATCH 7/7] Update sdk/storage/azure-storage/setup.py --- sdk/storage/azure-storage/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/storage/azure-storage/setup.py b/sdk/storage/azure-storage/setup.py index 31d1928b9ee1..09a1ed367bfc 100644 --- a/sdk/storage/azure-storage/setup.py +++ b/sdk/storage/azure-storage/setup.py @@ -20,7 +20,7 @@ Here's a non-exhaustive list of common packages: -- [azure-storage-blob](https://pypi.org/project/azure-storage-blob) : Blob storage client +- [azure-storage-blob](https://pypi.org/project/azure-storage-blob) : Blob storage client - [azure-storage-file-share](https://pypi.org/project/azure-storage-file-share) : Storage file share client - [azure-storage-file-datalake](https://pypi.org/project/azure-storage-file-datalake) : ADLS Gen2 client - [azure-storage-queue](https://pypi.org/project/azure-storage-queue): Queue storage client