diff --git a/azure-cognitiveservices-search-visualsearch/MANIFEST.in b/azure-cognitiveservices-search-visualsearch/MANIFEST.in index 9ecaeb15de50..d1c7ea0ea56b 100644 --- a/azure-cognitiveservices-search-visualsearch/MANIFEST.in +++ b/azure-cognitiveservices-search-visualsearch/MANIFEST.in @@ -1,2 +1,5 @@ include *.rst -include azure_bdist_wheel.py \ No newline at end of file +include azure/__init__.py +include azure/cognitiveservices/__init__.py +include azure/cognitiveservices/search/__init__.py + diff --git a/azure-cognitiveservices-search-visualsearch/README.rst b/azure-cognitiveservices-search-visualsearch/README.rst index 800f91d3eeb5..45de4e6b43dd 100644 --- a/azure-cognitiveservices-search-visualsearch/README.rst +++ b/azure-cognitiveservices-search-visualsearch/README.rst @@ -1,9 +1,15 @@ Microsoft Azure SDK for Python ============================== -This is the Microsoft Azure Cognitive Services VisualSearch Client Library. +This is the Microsoft Azure MyService Management Client Library. -This package has been tested with Python 2.7, 3.4, 3.5 and 3.6. +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. @@ -30,9 +36,9 @@ If you see azure==0.11.0 (or any version below 1.0), uninstall it first: Usage ===== -For code examples, see `Visual Search -`__ -on readthedocs.org. +For code examples, see `MyService Management +`__ +on docs.microsoft.com. Provide Feedback diff --git a/azure-cognitiveservices-search-visualsearch/azure/__init__.py b/azure-cognitiveservices-search-visualsearch/azure/__init__.py index 849489fca33c..0260537a02bb 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/__init__.py +++ b/azure-cognitiveservices-search-visualsearch/azure/__init__.py @@ -1 +1 @@ -__import__('pkg_resources').declare_namespace(__name__) +__path__ = __import__('pkgutil').extend_path(__path__, __name__) \ No newline at end of file diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/__init__.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/__init__.py index 849489fca33c..0260537a02bb 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/__init__.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/__init__.py @@ -1 +1 @@ -__import__('pkg_resources').declare_namespace(__name__) +__path__ = __import__('pkgutil').extend_path(__path__, __name__) \ No newline at end of file diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/__init__.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/__init__.py index 849489fca33c..0260537a02bb 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/__init__.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/__init__.py @@ -1 +1 @@ -__import__('pkg_resources').declare_namespace(__name__) +__path__ = __import__('pkgutil').extend_path(__path__, __name__) \ No newline at end of file diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_object.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_object.py index eb930bba284a..af54a220f5bb 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_object.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_object.py @@ -61,7 +61,7 @@ class ImageObject(MediaObject): :ivar content_size: Size of the media object content. Use format "value unit" (e.g., "1024 B"). :vartype content_size: str - :ivar encoding_format: Encoding format (e.g., mp3, mp4, jpeg, etc). + :ivar encoding_format: Encoding format (e.g., png, gif, jpeg, etc). :vartype encoding_format: str :ivar host_page_display_url: Display URL of the page that hosts the media object. diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_object_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_object_py3.py index 76c7c9f42e2c..3e211afcb446 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_object_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_object_py3.py @@ -61,7 +61,7 @@ class ImageObject(MediaObject): :ivar content_size: Size of the media object content. Use format "value unit" (e.g., "1024 B"). :vartype content_size: str - :ivar encoding_format: Encoding format (e.g., mp3, mp4, jpeg, etc). + :ivar encoding_format: Encoding format (e.g., png, gif, jpeg, etc). :vartype encoding_format: str :ivar host_page_display_url: Display URL of the page that hosts the media object. diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/media_object.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/media_object.py index ec58382e5f65..23ecb86e41cf 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/media_object.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/media_object.py @@ -64,7 +64,7 @@ class MediaObject(CreativeWork): :ivar content_size: Size of the media object content. Use format "value unit" (e.g., "1024 B"). :vartype content_size: str - :ivar encoding_format: Encoding format (e.g., mp3, mp4, jpeg, etc). + :ivar encoding_format: Encoding format (e.g., png, gif, jpeg, etc). :vartype encoding_format: str :ivar host_page_display_url: Display URL of the page that hosts the media object. diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/media_object_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/media_object_py3.py index 1892863a64c1..59d2ea66aa16 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/media_object_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/media_object_py3.py @@ -64,7 +64,7 @@ class MediaObject(CreativeWork): :ivar content_size: Size of the media object content. Use format "value unit" (e.g., "1024 B"). :vartype content_size: str - :ivar encoding_format: Encoding format (e.g., mp3, mp4, jpeg, etc). + :ivar encoding_format: Encoding format (e.g., png, gif, jpeg, etc). :vartype encoding_format: str :ivar host_page_display_url: Display URL of the page that hosts the media object. diff --git a/azure-cognitiveservices-search-visualsearch/azure_bdist_wheel.py b/azure-cognitiveservices-search-visualsearch/azure_bdist_wheel.py deleted file mode 100644 index 8a81d1b61775..000000000000 --- a/azure-cognitiveservices-search-visualsearch/azure_bdist_wheel.py +++ /dev/null @@ -1,54 +0,0 @@ -#------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -#-------------------------------------------------------------------------- - -from distutils import log as logger -import os.path - -from wheel.bdist_wheel import bdist_wheel -class azure_bdist_wheel(bdist_wheel): - """The purpose of this class is to build wheel a little differently than the sdist, - without requiring to build the wheel from the sdist (i.e. you can build the wheel - directly from source). - """ - - description = "Create an Azure wheel distribution" - - user_options = bdist_wheel.user_options + \ - [('azure-namespace-package=', None, - "Name of the deepest nspkg used")] - - def initialize_options(self): - bdist_wheel.initialize_options(self) - self.azure_namespace_package = None - - def finalize_options(self): - bdist_wheel.finalize_options(self) - if self.azure_namespace_package and not self.azure_namespace_package.endswith("-nspkg"): - raise ValueError("azure_namespace_package must finish by -nspkg") - - def run(self): - if not self.distribution.install_requires: - self.distribution.install_requires = [] - self.distribution.install_requires.append( - "{}>=2.0.0".format(self.azure_namespace_package)) - bdist_wheel.run(self) - - def write_record(self, bdist_dir, distinfo_dir): - if self.azure_namespace_package: - # Split and remove last part, assuming it's "nspkg" - subparts = self.azure_namespace_package.split('-')[0:-1] - folder_with_init = [os.path.join(*subparts[0:i+1]) for i in range(len(subparts))] - for azure_sub_package in folder_with_init: - init_file = os.path.join(bdist_dir, azure_sub_package, '__init__.py') - if os.path.isfile(init_file): - logger.info("manually remove {} while building the wheel".format(init_file)) - os.remove(init_file) - else: - raise ValueError("Unable to find {}. Are you sure of your namespace package?".format(init_file)) - bdist_wheel.write_record(self, bdist_dir, distinfo_dir) -cmdclass = { - 'bdist_wheel': azure_bdist_wheel, -} diff --git a/azure-cognitiveservices-search-visualsearch/sdk_packaging.toml b/azure-cognitiveservices-search-visualsearch/sdk_packaging.toml new file mode 100644 index 000000000000..a199bf294c28 --- /dev/null +++ b/azure-cognitiveservices-search-visualsearch/sdk_packaging.toml @@ -0,0 +1,7 @@ +[packaging] +package_name = "azure-cognitiveservices-search-visualsearch" +package_nspkg = "azure-cognitiveservices-search-nspkg" +package_pprint_name = "MyService Management" +package_doc_id = "" +is_stable = false +is_arm = true diff --git a/azure-cognitiveservices-search-visualsearch/setup.cfg b/azure-cognitiveservices-search-visualsearch/setup.cfg index 4659976f991c..3c6e79cf31da 100644 --- a/azure-cognitiveservices-search-visualsearch/setup.cfg +++ b/azure-cognitiveservices-search-visualsearch/setup.cfg @@ -1,3 +1,2 @@ [bdist_wheel] universal=1 -azure-namespace-package=azure-cognitiveservices-search-nspkg \ No newline at end of file diff --git a/azure-cognitiveservices-search-visualsearch/setup.py b/azure-cognitiveservices-search-visualsearch/setup.py index c815f23999c0..a98b0bf2e7e6 100644 --- a/azure-cognitiveservices-search-visualsearch/setup.py +++ b/azure-cognitiveservices-search-visualsearch/setup.py @@ -10,16 +10,10 @@ import os.path from io import open from setuptools import find_packages, setup -try: - from azure_bdist_wheel import cmdclass -except ImportError: - from distutils import log as logger - logger.warn("Wheel is not available, disabling bdist_wheel hook") - cmdclass = {} # Change the PACKAGE_NAME only to change folder and different name PACKAGE_NAME = "azure-cognitiveservices-search-visualsearch" -PACKAGE_PPRINT_NAME = "Cognitive Services VisualSearch" +PACKAGE_PPRINT_NAME = "MyService Management" # a-b-c => a/b/c package_folder_path = PACKAGE_NAME.replace('-', '/') @@ -72,13 +66,23 @@ 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', 'License :: OSI Approved :: MIT License', ], zip_safe=False, - packages=find_packages(exclude=["tests"]), + packages=find_packages(exclude=[ + 'tests', + # Exclude packages that will be covered by PEP420 or nspkg + 'azure', + 'azure.cognitiveservices', + 'azure.cognitiveservices.search', + ]), install_requires=[ - 'msrest>=0.4.28,<2.0.0', + 'msrest>=0.5.0', + 'msrestazure>=0.4.32,<2.0.0', 'azure-common~=1.1', ], - cmdclass=cmdclass + extras_require={ + ":python_version<'3.0'": ['azure-cognitiveservices-search-nspkg'], + } )