From fdc62ab270e1d05184de0303ba21d722ce0c04e4 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Sat, 22 Jun 2019 21:08:54 +0000 Subject: [PATCH] Packaging update of azure-storage-queue --- sdk/storage/azure-storage-queue/HISTORY.rst | 9 +++++ sdk/storage/azure-storage-queue/MANIFEST.in | 5 +-- sdk/storage/azure-storage-queue/README.rst | 33 +++++++++++++++++++ .../azure-storage-queue/azure/__init__.py | 2 +- .../azure/storage/__init__.py | 2 +- .../azure-storage-queue/sdk_packaging.toml | 8 +++++ sdk/storage/azure-storage-queue/setup.py | 15 +++++---- 7 files changed, 63 insertions(+), 11 deletions(-) create mode 100644 sdk/storage/azure-storage-queue/HISTORY.rst create mode 100644 sdk/storage/azure-storage-queue/README.rst create mode 100644 sdk/storage/azure-storage-queue/sdk_packaging.toml diff --git a/sdk/storage/azure-storage-queue/HISTORY.rst b/sdk/storage/azure-storage-queue/HISTORY.rst new file mode 100644 index 00000000000..8924d5d6c44 --- /dev/null +++ b/sdk/storage/azure-storage-queue/HISTORY.rst @@ -0,0 +1,9 @@ +.. :changelog: + +Release History +=============== + +0.1.0 (1970-01-01) +++++++++++++++++++ + +* Initial Release diff --git a/sdk/storage/azure-storage-queue/MANIFEST.in b/sdk/storage/azure-storage-queue/MANIFEST.in index 9babac44ebe..e661bed6a00 100644 --- a/sdk/storage/azure-storage-queue/MANIFEST.in +++ b/sdk/storage/azure-storage-queue/MANIFEST.in @@ -1,4 +1,5 @@ -include *.md +recursive-include tests *.py *.yaml +include *.rst include azure/__init__.py include azure/storage/__init__.py -include LICENSE.txt + diff --git a/sdk/storage/azure-storage-queue/README.rst b/sdk/storage/azure-storage-queue/README.rst new file mode 100644 index 00000000000..55ad2fe1ef9 --- /dev/null +++ b/sdk/storage/azure-storage-queue/README.rst @@ -0,0 +1,33 @@ +Microsoft Azure SDK for Python +============================== + +This is the Microsoft Azure MyService Management Client Library. + +Azure Resource Manager (ARM) is the next generation of management APIs that +replace the old Azure Service Management (ASM). + +This package has been tested with Python 2.7, 3.4, 3.5, 3.6 and 3.7. + +For the older Azure Service Management (ASM) libraries, see +`azure-servicemanagement-legacy `__ library. + +For a more complete set of Azure libraries, see the `azure `__ bundle package. + + +Usage +===== + +For code examples, see `MyService Management +`__ +on docs.microsoft.com. + + +Provide Feedback +================ + +If you encounter any bugs or have suggestions, please file an issue in the +`Issues `__ +section of the project. + + +.. image:: https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-storage-queue%2FREADME.png diff --git a/sdk/storage/azure-storage-queue/azure/__init__.py b/sdk/storage/azure-storage-queue/azure/__init__.py index 59cb7014657..0260537a02b 100644 --- a/sdk/storage/azure-storage-queue/azure/__init__.py +++ b/sdk/storage/azure-storage-queue/azure/__init__.py @@ -1 +1 @@ -__path__ = __import__('pkgutil').extend_path(__path__, __name__) # type: str +__path__ = __import__('pkgutil').extend_path(__path__, __name__) \ No newline at end of file diff --git a/sdk/storage/azure-storage-queue/azure/storage/__init__.py b/sdk/storage/azure-storage-queue/azure/storage/__init__.py index 59cb7014657..0260537a02b 100644 --- a/sdk/storage/azure-storage-queue/azure/storage/__init__.py +++ b/sdk/storage/azure-storage-queue/azure/storage/__init__.py @@ -1 +1 @@ -__path__ = __import__('pkgutil').extend_path(__path__, __name__) # type: str +__path__ = __import__('pkgutil').extend_path(__path__, __name__) \ No newline at end of file diff --git a/sdk/storage/azure-storage-queue/sdk_packaging.toml b/sdk/storage/azure-storage-queue/sdk_packaging.toml new file mode 100644 index 00000000000..7148efe5696 --- /dev/null +++ b/sdk/storage/azure-storage-queue/sdk_packaging.toml @@ -0,0 +1,8 @@ +[packaging] +package_name = "azure-storage-queue" +package_nspkg = "azure-storage-nspkg" +package_pprint_name = "MyService Management" +package_doc_id = "" +is_stable = false +is_arm = true +need_msrestazure = true diff --git a/sdk/storage/azure-storage-queue/setup.py b/sdk/storage/azure-storage-queue/setup.py index 15b2230982e..4176e7a56eb 100644 --- a/sdk/storage/azure-storage-queue/setup.py +++ b/sdk/storage/azure-storage-queue/setup.py @@ -9,7 +9,7 @@ import re import os.path from io import open -from setuptools import find_packages, setup # type: ignore +from setuptools import find_packages, setup # Change the PACKAGE_NAME only to change folder and different name PACKAGE_NAME = "azure-storage-queue" @@ -25,7 +25,7 @@ try: import azure try: - ver = azure.__version__ # type: ignore + ver = azure.__version__ raise Exception( 'This package is incompatible with azure=={}. '.format(ver) + 'Uninstall it with "pip uninstall azure".' @@ -37,15 +37,15 @@ # Version extraction inspired from 'requests' with open(os.path.join(package_folder_path, 'version.py'), 'r') as fd: - version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', # type: ignore + version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE).group(1) if not version: raise RuntimeError('Cannot find version information') -with open('README.md', encoding='utf-8') as f: +with open('README.rst', encoding='utf-8') as f: readme = f.read() -with open('HISTORY.md', encoding='utf-8') as f: +with open('HISTORY.rst', encoding='utf-8') as f: history = f.read() setup( @@ -53,7 +53,7 @@ version=version, description='Microsoft Azure {} Client Library for Python'.format(PACKAGE_PPRINT_NAME), long_description=readme + '\n\n' + history, - long_description_content_type='text/markdown', + long_description_content_type='text/x-rst', license='MIT License', author='Microsoft Corporation', author_email='azpysdkhelp@microsoft.com', @@ -75,6 +75,7 @@ 'tests', # Exclude packages that will be covered by PEP420 or nspkg 'azure', + 'azure.storage', ]), install_requires=[ 'msrest>=0.5.0', @@ -82,6 +83,6 @@ 'azure-common~=1.1', ], extras_require={ - ":python_version<'3.0'": ['azure-nspkg'], + ":python_version<'3.0'": ['azure-storage-nspkg'], } )