Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion azure-cognitiveservices-search-visualsearch/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
include *.rst
include azure_bdist_wheel.py
include azure/__init__.py
include azure/cognitiveservices/__init__.py
include azure/cognitiveservices/search/__init__.py

16 changes: 11 additions & 5 deletions azure-cognitiveservices-search-visualsearch/README.rst
Original file line number Diff line number Diff line change
@@ -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 <https://pypi.python.org/pypi/azure-servicemanagement-legacy>`__ library.

For a more complete set of Azure libraries, see the `azure <https://pypi.python.org/pypi/azure>`__ bundle package.

Expand All @@ -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
<https://docs.microsoft.com/python/api/overview/azure/cognitive-services>`__
on readthedocs.org.
For code examples, see `MyService Management
<https://docs.microsoft.com/python/api/overview/azure/>`__
on docs.microsoft.com.


Provide Feedback
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__import__('pkg_resources').declare_namespace(__name__)
__path__ = __import__('pkgutil').extend_path(__path__, __name__)
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__import__('pkg_resources').declare_namespace(__name__)
__path__ = __import__('pkgutil').extend_path(__path__, __name__)
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__import__('pkg_resources').declare_namespace(__name__)
__path__ = __import__('pkgutil').extend_path(__path__, __name__)
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
54 changes: 0 additions & 54 deletions azure-cognitiveservices-search-visualsearch/azure_bdist_wheel.py

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion azure-cognitiveservices-search-visualsearch/setup.cfg
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
[bdist_wheel]
universal=1
azure-namespace-package=azure-cognitiveservices-search-nspkg
24 changes: 14 additions & 10 deletions azure-cognitiveservices-search-visualsearch/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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('-', '/')
Expand Down Expand Up @@ -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'],
}
)