Fix azure-cognitiveservices-nspkg (and sub nspkg) (#4467)

* Fix azure-cognitiveservices-nspkg * Fix azure-cognitiveservices-language-nspkg * Fix indentation in Readme * Fix azure-cognitiveservices-search-nspkg * Fix azure-cognitiveservices-vision-nspkg * Add missing import sys
Azure · Mar 1, 2019 · a1a242b · a1a242b
1 parent 95e618e
commit a1a242b
Show file tree

Hide file tree

Showing 17 changed files with 72 additions and 36 deletions.
diff --git 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 <https://www.python.org/dev/peps/pep-0420/>` 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 <https://www.python.org/dev/peps/pep-0420/>` 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.
 

diff --git 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
@@ -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 <https://www.python.org/dev/peps/pep-0420/>` 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
diff --git 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
@@ -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',
     ]

diff --git 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
@@ -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 <https://www.python.org/dev/peps/pep-0420/>` 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
diff --git 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
@@ -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',
     ]

diff --git 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
@@ -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 <https://www.python.org/dev/peps/pep-0420/>` 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
diff --git 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
@@ -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',
     ]

diff --git 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
@@ -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 <https://www.python.org/dev/peps/pep-0420/>` 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
diff --git 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
@@ -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',
     ]
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		include *.rst
		include azure/cognitiveservices/__init__.py