From 6d16046dcacc27bf663bf3c784a25986dc72b18c Mon Sep 17 00:00:00 2001 From: Laurent Mazuel Date: Fri, 1 Mar 2019 11:26:47 -0800 Subject: [PATCH 1/6] Fix azure-cognitiveservices-nspkg --- azure-cognitiveservices-nspkg/MANIFEST.in | 1 + azure-cognitiveservices-nspkg/README.rst | 2 +- azure-cognitiveservices-nspkg/setup.cfg | 2 -- azure-cognitiveservices-nspkg/setup.py | 19 ++++++++++++++----- 4 files changed, 16 insertions(+), 8 deletions(-) delete mode 100644 azure-cognitiveservices-nspkg/setup.cfg diff --git a/azure-cognitiveservices-nspkg/MANIFEST.in b/azure-cognitiveservices-nspkg/MANIFEST.in index bb37a2723dae..e16272640bb0 100644 --- a/azure-cognitiveservices-nspkg/MANIFEST.in +++ b/azure-cognitiveservices-nspkg/MANIFEST.in @@ -1 +1,2 @@ include *.rst +include azure/cognitiveservices/__init__.py diff --git a/azure-cognitiveservices-nspkg/README.rst b/azure-cognitiveservices-nspkg/README.rst index cee9edfb04fd..43b6390eb786 100644 --- a/azure-cognitiveservices-nspkg/README.rst +++ b/azure-cognitiveservices-nspkg/README.rst @@ -6,7 +6,7 @@ This is the Microsoft Azure Cognitive Services namespace package. This package is not intended to be installed directly by the end user. Since version 3.0, this is Python 2 package only, Python 3.x SDKs will use `PEP420 ` as namespace package strategy. -This package will use `python_requires` to enforce Python 2 installation. This implies that you might see this package on Python 3 environment if you have pip < 9.0 or setuptools < 24.2.0. +To avoid issues with package servers that does not support `python_requires`, a Python 3 package is installed but is empty. It provides the necessary files for other packages to extend the azure.cognitiveservices namespace. diff --git a/azure-cognitiveservices-nspkg/setup.cfg b/azure-cognitiveservices-nspkg/setup.cfg deleted file mode 100644 index 3c6e79cf31da..000000000000 --- a/azure-cognitiveservices-nspkg/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal=1 diff --git a/azure-cognitiveservices-nspkg/setup.py b/azure-cognitiveservices-nspkg/setup.py index ca45bfb2ebf3..4adb8d1d5c89 100644 --- a/azure-cognitiveservices-nspkg/setup.py +++ b/azure-cognitiveservices-nspkg/setup.py @@ -23,9 +23,16 @@ except ImportError: pass +PACKAGES = [] +# Do an empty package on Python 3 and not python_requires, since not everybody is ready +# https://github.com/Azure/azure-sdk-for-python/issues/3447 +# https://github.com/Azure/azure-sdk-for-python/issues/3481 +if sys.version_info[0] < 3: + PACKAGES = ['azure.cognitiveservices'] + setup( name='azure-cognitiveservices-nspkg', - version='3.0.0', + version='3.0.1', description='Microsoft Azure Cognitive Services Namespace Package [Internal]', long_description=open('README.rst', 'r').read(), license='MIT License', @@ -37,13 +44,15 @@ 'Programming Language :: Python', 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3', + '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=[ - 'azure.cognitiveservices', - ], - python_requires='<3', + packages=PACKAGES, install_requires=[ 'azure-nspkg>=3.0.0', ] From f196e77434f107069ef187f7deadd0557ac75666 Mon Sep 17 00:00:00 2001 From: Laurent Mazuel Date: Fri, 1 Mar 2019 11:32:01 -0800 Subject: [PATCH 2/6] Fix azure-cognitiveservices-language-nspkg --- .../MANIFEST.in | 2 ++ .../README.rst | 2 +- .../setup.cfg | 2 -- .../setup.py | 19 ++++++++++++++----- 4 files changed, 17 insertions(+), 8 deletions(-) delete mode 100644 azure-cognitiveservices-language-nspkg/setup.cfg diff --git a/azure-cognitiveservices-language-nspkg/MANIFEST.in b/azure-cognitiveservices-language-nspkg/MANIFEST.in index bb37a2723dae..36886ba27540 100644 --- a/azure-cognitiveservices-language-nspkg/MANIFEST.in +++ b/azure-cognitiveservices-language-nspkg/MANIFEST.in @@ -1 +1,3 @@ include *.rst +include azure/cognitiveservices/__init__.py +include azure/cognitiveservices/language/__init__.py diff --git a/azure-cognitiveservices-language-nspkg/README.rst b/azure-cognitiveservices-language-nspkg/README.rst index 5dea106b65bb..83583744dca3 100644 --- a/azure-cognitiveservices-language-nspkg/README.rst +++ b/azure-cognitiveservices-language-nspkg/README.rst @@ -6,7 +6,7 @@ This is the Microsoft Azure Cognitive Services Language namespace package. This package is not intended to be installed directly by the end user. Since version 3.0, this is Python 2 package only, Python 3.x SDKs will use `PEP420 ` as namespace package strategy. -This package will use `python_requires` to enforce Python 2 installation. This implies that you might see this package on Python 3 environment if you have pip < 9.0 or setuptools < 24.2.0. +To avoid issues with package servers that does not support `python_requires`, a Python 3 package is installed but is empty. It provides the necessary files for other packages to extend the azure.cognitiveservices.language namespace. diff --git a/azure-cognitiveservices-language-nspkg/setup.cfg b/azure-cognitiveservices-language-nspkg/setup.cfg deleted file mode 100644 index 3c6e79cf31da..000000000000 --- a/azure-cognitiveservices-language-nspkg/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal=1 diff --git a/azure-cognitiveservices-language-nspkg/setup.py b/azure-cognitiveservices-language-nspkg/setup.py index 93fb63183266..3eaf976fa9d1 100644 --- a/azure-cognitiveservices-language-nspkg/setup.py +++ b/azure-cognitiveservices-language-nspkg/setup.py @@ -23,9 +23,16 @@ except ImportError: pass +PACKAGES = [] +# Do an empty package on Python 3 and not python_requires, since not everybody is ready +# https://github.com/Azure/azure-sdk-for-python/issues/3447 +# https://github.com/Azure/azure-sdk-for-python/issues/3481 +if sys.version_info[0] < 3: + PACKAGES = ['azure.cognitiveservices.language'] + setup( name='azure-cognitiveservices-language-nspkg', - version='3.0.0', + version='3.0.1', description='Microsoft Azure Cognitive Services Language Namespace Package [Internal]', long_description=open('README.rst', 'r').read(), license='MIT License', @@ -37,13 +44,15 @@ 'Programming Language :: Python', 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3', + '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=[ - 'azure.cognitiveservices.language', - ], - python_requires='<3', + packages=PACKAGES, install_requires=[ 'azure-cognitiveservices-nspkg>=3.0.0', ] From 04ad8512ce4a7112a775343300d8c6c8ae5338a0 Mon Sep 17 00:00:00 2001 From: Laurent Mazuel Date: Fri, 1 Mar 2019 11:34:04 -0800 Subject: [PATCH 3/6] Fix indentation in Readme --- azure-cognitiveservices-knowledge-nspkg/README.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azure-cognitiveservices-knowledge-nspkg/README.rst b/azure-cognitiveservices-knowledge-nspkg/README.rst index 1fb04a88de2a..2b58ca2c8c63 100644 --- a/azure-cognitiveservices-knowledge-nspkg/README.rst +++ b/azure-cognitiveservices-knowledge-nspkg/README.rst @@ -5,7 +5,8 @@ This is the Microsoft Azure Cognitive Services Knowledge namespace package. This package is not intended to be installed directly by the end user. -Since version 3.0, this is Python 2 package only, Python 3.x SDKs will use `PEP420 ` as namespace package strategy. To avoid issues with package servers that does not support python_requires, a Python 3 package is installed but is empty. +Since version 3.0, this is Python 2 package only, Python 3.x SDKs will use `PEP420 ` as namespace package strategy. +To avoid issues with package servers that does not support python_requires, a Python 3 package is installed but is empty. It provides the necessary files for other packages to extend the azure.cognitiveservices.knowledge namespace. From c1f01e8f6376c09cf2828cbd8c1edd0eb4c88cb8 Mon Sep 17 00:00:00 2001 From: Laurent Mazuel Date: Fri, 1 Mar 2019 11:36:23 -0800 Subject: [PATCH 4/6] Fix azure-cognitiveservices-search-nspkg --- .../MANIFEST.in | 2 ++ .../README.rst | 2 +- .../setup.cfg | 2 -- azure-cognitiveservices-search-nspkg/setup.py | 19 ++++++++++++++----- 4 files changed, 17 insertions(+), 8 deletions(-) delete mode 100644 azure-cognitiveservices-search-nspkg/setup.cfg diff --git a/azure-cognitiveservices-search-nspkg/MANIFEST.in b/azure-cognitiveservices-search-nspkg/MANIFEST.in index bb37a2723dae..dafacd0fdebd 100644 --- a/azure-cognitiveservices-search-nspkg/MANIFEST.in +++ b/azure-cognitiveservices-search-nspkg/MANIFEST.in @@ -1 +1,3 @@ include *.rst +include azure/cognitiveservices/__init__.py +include azure/cognitiveservices/search/__init__.py diff --git a/azure-cognitiveservices-search-nspkg/README.rst b/azure-cognitiveservices-search-nspkg/README.rst index 8250270c5bbc..a8a0a583f699 100644 --- a/azure-cognitiveservices-search-nspkg/README.rst +++ b/azure-cognitiveservices-search-nspkg/README.rst @@ -6,7 +6,7 @@ This is the Microsoft Azure Cognitive Services Search namespace package. This package is not intended to be installed directly by the end user. Since version 3.0, this is Python 2 package only, Python 3.x SDKs will use `PEP420 ` as namespace package strategy. -This package will use `python_requires` to enforce Python 2 installation. This implies that you might see this package on Python 3 environment if you have pip < 9.0 or setuptools < 24.2.0. +To avoid issues with package servers that does not support `python_requires`, a Python 3 package is installed but is empty. It provides the necessary files for other packages to extend the azure.cognitiveservices.search namespace. diff --git a/azure-cognitiveservices-search-nspkg/setup.cfg b/azure-cognitiveservices-search-nspkg/setup.cfg deleted file mode 100644 index 3c6e79cf31da..000000000000 --- a/azure-cognitiveservices-search-nspkg/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal=1 diff --git a/azure-cognitiveservices-search-nspkg/setup.py b/azure-cognitiveservices-search-nspkg/setup.py index 115c48a6dde0..1668807a0d6b 100644 --- a/azure-cognitiveservices-search-nspkg/setup.py +++ b/azure-cognitiveservices-search-nspkg/setup.py @@ -23,9 +23,16 @@ except ImportError: pass +PACKAGES = [] +# Do an empty package on Python 3 and not python_requires, since not everybody is ready +# https://github.com/Azure/azure-sdk-for-python/issues/3447 +# https://github.com/Azure/azure-sdk-for-python/issues/3481 +if sys.version_info[0] < 3: + PACKAGES = ['azure.cognitiveservices.search'] + setup( name='azure-cognitiveservices-search-nspkg', - version='3.0.0', + version='3.0.1', description='Microsoft Azure Cognitive Services Search Namespace Package [Internal]', long_description=open('README.rst', 'r').read(), license='MIT License', @@ -37,13 +44,15 @@ 'Programming Language :: Python', 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3', + '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=[ - 'azure.cognitiveservices.search', - ], - python_requires='<3', + packages=PACKAGES, install_requires=[ 'azure-cognitiveservices-nspkg>=3.0.0', ] From 83d24287a505f95b180319903c45ad063bbdc944 Mon Sep 17 00:00:00 2001 From: Laurent Mazuel Date: Fri, 1 Mar 2019 11:40:14 -0800 Subject: [PATCH 5/6] Fix azure-cognitiveservices-vision-nspkg --- .../MANIFEST.in | 2 ++ azure-cognitiveservices-vision-nspkg/README.rst | 2 +- azure-cognitiveservices-vision-nspkg/setup.cfg | 2 -- azure-cognitiveservices-vision-nspkg/setup.py | 17 +++++++++++++---- 4 files changed, 16 insertions(+), 7 deletions(-) delete mode 100644 azure-cognitiveservices-vision-nspkg/setup.cfg diff --git a/azure-cognitiveservices-vision-nspkg/MANIFEST.in b/azure-cognitiveservices-vision-nspkg/MANIFEST.in index bb37a2723dae..b80290d8b346 100644 --- a/azure-cognitiveservices-vision-nspkg/MANIFEST.in +++ b/azure-cognitiveservices-vision-nspkg/MANIFEST.in @@ -1 +1,3 @@ include *.rst +include azure/cognitiveservices/__init__.py +include azure/cognitiveservices/vision/__init__.py diff --git a/azure-cognitiveservices-vision-nspkg/README.rst b/azure-cognitiveservices-vision-nspkg/README.rst index 1d12e0a19abc..41abda37dc27 100644 --- a/azure-cognitiveservices-vision-nspkg/README.rst +++ b/azure-cognitiveservices-vision-nspkg/README.rst @@ -6,7 +6,7 @@ This is the Microsoft Azure Cognitive Services Vision namespace package. This package is not intended to be installed directly by the end user. Since version 3.0, this is Python 2 package only, Python 3.x SDKs will use `PEP420 ` as namespace package strategy. -This package will use `python_requires` to enforce Python 2 installation. This implies that you might see this package on Python 3 environment if you have pip < 9.0 or setuptools < 24.2.0. +To avoid issues with package servers that does not support `python_requires`, a Python 3 package is installed but is empty. It provides the necessary files for other packages to extend the azure.cognitiveservices.vision namespace. diff --git a/azure-cognitiveservices-vision-nspkg/setup.cfg b/azure-cognitiveservices-vision-nspkg/setup.cfg deleted file mode 100644 index 3c6e79cf31da..000000000000 --- a/azure-cognitiveservices-vision-nspkg/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal=1 diff --git a/azure-cognitiveservices-vision-nspkg/setup.py b/azure-cognitiveservices-vision-nspkg/setup.py index 0e81a91d639d..b651e372b9f1 100644 --- a/azure-cognitiveservices-vision-nspkg/setup.py +++ b/azure-cognitiveservices-vision-nspkg/setup.py @@ -23,6 +23,13 @@ except ImportError: pass +PACKAGES = [] +# Do an empty package on Python 3 and not python_requires, since not everybody is ready +# https://github.com/Azure/azure-sdk-for-python/issues/3447 +# https://github.com/Azure/azure-sdk-for-python/issues/3481 +if sys.version_info[0] < 3: + PACKAGES = ['azure.cognitiveservices.vision'] + setup( name='azure-cognitiveservices-vision-nspkg', version='3.0.0', @@ -37,13 +44,15 @@ 'Programming Language :: Python', 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3', + '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=[ - 'azure.cognitiveservices.vision', - ], - python_requires='<3', + packages=PACKAGES, install_requires=[ 'azure-cognitiveservices-nspkg>=3.0.0', ] From 6e8530cc1dcd7c316713f79899c141df810207de Mon Sep 17 00:00:00 2001 From: Laurent Mazuel Date: Fri, 1 Mar 2019 11:53:10 -0800 Subject: [PATCH 6/6] Add missing import sys --- azure-cognitiveservices-language-nspkg/setup.py | 2 +- azure-cognitiveservices-nspkg/setup.py | 2 +- azure-cognitiveservices-search-nspkg/setup.py | 2 +- azure-cognitiveservices-vision-nspkg/setup.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-cognitiveservices-language-nspkg/setup.py b/azure-cognitiveservices-language-nspkg/setup.py index 3eaf976fa9d1..31f150560c98 100644 --- a/azure-cognitiveservices-language-nspkg/setup.py +++ b/azure-cognitiveservices-language-nspkg/setup.py @@ -5,7 +5,7 @@ # Licensed under the MIT License. See License.txt in the project root for # license information. #-------------------------------------------------------------------------- - +import sys from setuptools import setup # azure v0.x is not compatible with this package diff --git a/azure-cognitiveservices-nspkg/setup.py b/azure-cognitiveservices-nspkg/setup.py index 4adb8d1d5c89..0412ba94ce76 100644 --- a/azure-cognitiveservices-nspkg/setup.py +++ b/azure-cognitiveservices-nspkg/setup.py @@ -5,7 +5,7 @@ # Licensed under the MIT License. See License.txt in the project root for # license information. #-------------------------------------------------------------------------- - +import sys from setuptools import setup # azure v0.x is not compatible with this package diff --git a/azure-cognitiveservices-search-nspkg/setup.py b/azure-cognitiveservices-search-nspkg/setup.py index 1668807a0d6b..ee86844aaaca 100644 --- a/azure-cognitiveservices-search-nspkg/setup.py +++ b/azure-cognitiveservices-search-nspkg/setup.py @@ -5,7 +5,7 @@ # Licensed under the MIT License. See License.txt in the project root for # license information. #-------------------------------------------------------------------------- - +import sys from setuptools import setup # azure v0.x is not compatible with this package diff --git a/azure-cognitiveservices-vision-nspkg/setup.py b/azure-cognitiveservices-vision-nspkg/setup.py index b651e372b9f1..991ea8fc3cb4 100644 --- a/azure-cognitiveservices-vision-nspkg/setup.py +++ b/azure-cognitiveservices-vision-nspkg/setup.py @@ -5,7 +5,7 @@ # Licensed under the MIT License. See License.txt in the project root for # license information. #-------------------------------------------------------------------------- - +import sys from setuptools import setup # azure v0.x is not compatible with this package