Azure · lmazuel · Sep 25, 2018 · Sep 21, 2018 · Sep 22, 2018 · Sep 24, 2018
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,8 @@
 __pycache__/
 *.pyc
 .pytest_cache
+.mypy_cache
+.cache
 
 # Virtual environment
 env*/
@@ -26,7 +28,7 @@ build/
 # Test results
 TestResults/
 
-# Credentials 
+# Credentials
 credentials_real.json
 testsettings_local.json
 testsettings_local.cfg

diff --git a/azure-applicationinsights/MANIFEST.in b/azure-applicationinsights/MANIFEST.in
@@ -1,2 +1 @@
 include *.rst
-include azure_bdist_wheel.py
diff --git a/azure-applicationinsights/README.rst b/azure-applicationinsights/README.rst
@@ -6,7 +6,7 @@ This is the Microsoft Azure Application Insights 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 and 3.6.
+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.

diff --git a/azure-applicationinsights/azure/__init__.py b/azure-applicationinsights/azure/__init__.py
@@ -1 +1 @@
-__import__('pkg_resources').declare_namespace(__name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/azure-applicationinsights/azure_bdist_wheel.py b/azure-applicationinsights/azure_bdist_wheel.py
diff --git a/azure-applicationinsights/setup.cfg b/azure-applicationinsights/setup.cfg
@@ -1,3 +1,2 @@
 [bdist_wheel]
 universal=1
-azure-namespace-package=azure-nspkg
diff --git a/azure-applicationinsights/setup.py b/azure-applicationinsights/setup.py
@@ -10,12 +10,6 @@
 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-applicationinsights"
@@ -76,10 +70,16 @@
         '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',
+    ]),
     install_requires=[
-        'msrest>=0.5.4,<2.0.0',
+        'msrest>=0.5.0',
         'azure-common~=1.1',
     ],
-    cmdclass=cmdclass
+    extras_require={
+        ":python_version<'3.0'": ['azure-nspkg'],
+    }
 )
diff --git a/azure-batch/azure/__init__.py b/azure-batch/azure/__init__.py
@@ -1 +1 @@
-__import__('pkg_resources').declare_namespace(__name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/azure-cognitiveservices-language-luis/MANIFEST.in b/azure-cognitiveservices-language-luis/MANIFEST.in
@@ -1,2 +1 @@
 include *.rst
-include azure_bdist_wheel.py
diff --git a/azure-cognitiveservices-language-luis/azure/__init__.py b/azure-cognitiveservices-language-luis/azure/__init__.py
@@ -1 +1 @@
-__import__('pkg_resources').declare_namespace(__name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/azure-cognitiveservices-language-luis/azure/cognitiveservices/__init__.py b/azure-cognitiveservices-language-luis/azure/cognitiveservices/__init__.py
@@ -1 +1 @@
-__import__('pkg_resources').declare_namespace(__name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/azure-cognitiveservices-language-luis/azure/cognitiveservices/language/__init__.py b/azure-cognitiveservices-language-luis/azure/cognitiveservices/language/__init__.py
@@ -1 +1 @@
-__import__('pkg_resources').declare_namespace(__name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/azure-cognitiveservices-language-luis/azure_bdist_wheel.py b/azure-cognitiveservices-language-luis/azure_bdist_wheel.py
diff --git a/azure-cognitiveservices-language-luis/setup.cfg b/azure-cognitiveservices-language-luis/setup.cfg
@@ -1,3 +1,2 @@
 [bdist_wheel]
 universal=1
-azure-namespace-package=azure-cognitiveservices-language-nspkg
diff --git a/azure-cognitiveservices-language-luis/setup.py b/azure-cognitiveservices-language-luis/setup.py
@@ -10,12 +10,6 @@
 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-language-luis"
@@ -76,10 +70,18 @@
         '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.language',
+    ]),
     install_requires=[
         'msrest>=0.5.0',
         'azure-common~=1.1',
     ],
-    cmdclass=cmdclass
+    extras_require={
+        ":python_version<'3.0'": ['azure-cognitiveservices-language-nspkg'],
+    }
 )
diff --git a/azure-cognitiveservices-language-nspkg/README.rst b/azure-cognitiveservices-language-nspkg/README.rst
@@ -5,6 +5,9 @@ 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.
+
 It provides the necessary files for other packages to extend the azure.cognitiveservices.language namespace.
 
 If you are looking to install the Azure client libraries, see the

diff --git a/azure-cognitiveservices-language-nspkg/azure/__init__.py b/azure-cognitiveservices-language-nspkg/azure/__init__.py
@@ -0,0 +1 @@
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/azure-cognitiveservices-language-nspkg/azure/cognitiveservices/__init__.py b/azure-cognitiveservices-language-nspkg/azure/cognitiveservices/__init__.py
@@ -0,0 +1 @@
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/azure-cognitiveservices-language-nspkg/azure/cognitiveservices/language/__init__.py b/azure-cognitiveservices-language-nspkg/azure/cognitiveservices/language/__init__.py
@@ -0,0 +1 @@
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/azure-cognitiveservices-language-nspkg/sdk_packaging.toml b/azure-cognitiveservices-language-nspkg/sdk_packaging.toml
@@ -0,0 +1,2 @@
+[packaging]
+auto_update = false
diff --git a/azure-cognitiveservices-language-nspkg/setup.py b/azure-cognitiveservices-language-nspkg/setup.py
@@ -25,7 +25,7 @@
 
 setup(
     name='azure-cognitiveservices-language-nspkg',
-    version='2.0.0',
+    version='3.0.0',
     description='Microsoft Azure Cognitive Services Language Namespace Package [Internal]',
     long_description=open('README.rst', 'r').read(),
     license='MIT License',
@@ -37,19 +37,14 @@
         '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',
         'License :: OSI Approved :: MIT License',
     ],
     zip_safe=False,
     packages=[
-        'azure',
-        'azure.cognitiveservices',
         'azure.cognitiveservices.language',
     ],
+    python_requires='<3',
     install_requires=[
-        'azure-cognitiveservices-nspkg>=2.0.0',
+        'azure-cognitiveservices-nspkg>=3.0.0',
     ]
 )
diff --git a/azure-cognitiveservices-language-spellcheck/MANIFEST.in b/azure-cognitiveservices-language-spellcheck/MANIFEST.in
@@ -1,2 +1 @@
 include *.rst
-include azure_bdist_wheel.py
diff --git a/azure-cognitiveservices-language-spellcheck/README.rst b/azure-cognitiveservices-language-spellcheck/README.rst
@@ -1,9 +1,9 @@
 Microsoft Azure SDK for Python
 ==============================
 
-This is the Microsoft Azure Cognitive Services Bing Spell Check Client Library.
+This is the Microsoft Azure Cognitive Services Spellcheck Client Library.
 
-This package has been tested with Python 2.7, 3.4, 3.5 and 3.6.
+This package has been tested with Python 2.7, 3.4, 3.5, 3.6 and 3.7.
 
 For a more complete set of Azure libraries, see the `azure <https://pypi.python.org/pypi/azure>`__ bundle package.
 
@@ -30,9 +30,9 @@ If you see azure==0.11.0 (or any version below 1.0), uninstall it first:
 Usage
 =====
 
-For code examples, see `Spell Check
+For code examples, see `Cognitive Services Spellcheck
 <https://docs.microsoft.com/python/api/overview/azure/cognitive-services>`__
-on readthedocs.org.
+on docs.microsoft.com.
 
 
 Provide Feedback

diff --git a/azure-cognitiveservices-language-spellcheck/azure/__init__.py b/azure-cognitiveservices-language-spellcheck/azure/__init__.py
@@ -1 +1 @@
-__import__('pkg_resources').declare_namespace(__name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/azure-cognitiveservices-language-spellcheck/azure/cognitiveservices/__init__.py b/azure-cognitiveservices-language-spellcheck/azure/cognitiveservices/__init__.py
@@ -1 +1 @@
-__import__('pkg_resources').declare_namespace(__name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/azure-cognitiveservices-language-spellcheck/azure/cognitiveservices/language/__init__.py b/azure-cognitiveservices-language-spellcheck/azure/cognitiveservices/language/__init__.py
@@ -1 +1 @@
-__import__('pkg_resources').declare_namespace(__name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/azure-cognitiveservices-language-spellcheck/azure_bdist_wheel.py b/azure-cognitiveservices-language-spellcheck/azure_bdist_wheel.py
diff --git a/azure-cognitiveservices-language-spellcheck/sdk_packaging.toml b/azure-cognitiveservices-language-spellcheck/sdk_packaging.toml
@@ -0,0 +1,7 @@
+[packaging]
+package_name = "azure-cognitiveservices-language-spellcheck"
+package_nspkg = "azure-cognitiveservices-language-nspkg"
+package_pprint_name = "Cognitive Services Spellcheck"
+package_doc_id = "cognitive-services"
+is_stable = true
+is_arm = false
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
		@@ -0,0 +1 @@
		__path__ = __import__('pkgutil').extend_path(__path__, __name__)