[AutoPR cdn/resource-manager] typo: cdn/resource-manager/Microsoft.Cdn/cdn.json

azure-mgmt-cdn/MANIFEST.in

@@ -1,2 +1,4 @@
 include *.rst
-include azure_bdist_wheel.py
+include azure/__init__.py
+include azure/mgmt/__init__.py
+

azure-mgmt-cdn/README.rst

@@ -6,7 +6,7 @@ This is the Microsoft Azure CDN Management 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.

azure-mgmt-cdn/azure/__init__.py

@@ -1 +1 @@
-__import__('pkg_resources').declare_namespace(__name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)

azure-mgmt-cdn/azure/mgmt/__init__.py

@@ -1 +1 @@
-__import__('pkg_resources').declare_namespace(__name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)

azure-mgmt-cdn/azure/mgmt/cdn/models/cache_expiration_action_parameters.py

@@ -30,7 +30,7 @@ class CacheExpirationActionParameters(Model):
     :ivar cache_type: Required. The level at which the content needs to be
      cached. Default value: "All" .
     :vartype cache_type: str
-    :param cache_duration: The duration for which the the content needs to be
+    :param cache_duration: The duration for which the content needs to be
      cached. Allowed format is [d.]hh:mm:ss
     :type cache_duration: str
     """

azure-mgmt-cdn/azure/mgmt/cdn/models/cache_expiration_action_parameters_py3.py

@@ -30,7 +30,7 @@ class CacheExpirationActionParameters(Model):
     :ivar cache_type: Required. The level at which the content needs to be
      cached. Default value: "All" .
     :vartype cache_type: str
-    :param cache_duration: The duration for which the the content needs to be
+    :param cache_duration: The duration for which the content needs to be
      cached. Allowed format is [d.]hh:mm:ss
     :type cache_duration: str
     """

azure-mgmt-cdn/azure/mgmt/cdn/models/endpoint.py

@@ -40,7 +40,7 @@ class Endpoint(TrackedResource):
      default.
     :type origin_host_header: str
     :param origin_path: A directory path on the origin that CDN can use to
-     retreive content from, e.g. contoso.cloudapp.net/originpath.
+     retrieve content from, e.g. contoso.cloudapp.net/originpath.
     :type origin_path: str
     :param content_types_to_compress: List of content types on which
      compression applies. The value should be a valid MIME type.
@@ -78,8 +78,8 @@ class Endpoint(TrackedResource):
      routes for the CDN. This is relative to the origin path.
     :type probe_path: str
     :param geo_filters: List of rules defining the user's geo access within a
-     CDN endpoint. Each geo filter defines an acess rule to a specified path or
-     content, e.g. block APAC for path /pictures/
+     CDN endpoint. Each geo filter defines an access rule to a specified path
+     or content, e.g. block APAC for path /pictures/
     :type geo_filters: list[~azure.mgmt.cdn.models.GeoFilter]
     :param delivery_policy: A policy that specifies the delivery rules to be
      used for an endpoint.

azure-mgmt-cdn/azure/mgmt/cdn/models/endpoint_py3.py

@@ -40,7 +40,7 @@ class Endpoint(TrackedResource):
      default.
     :type origin_host_header: str
     :param origin_path: A directory path on the origin that CDN can use to
-     retreive content from, e.g. contoso.cloudapp.net/originpath.
+     retrieve content from, e.g. contoso.cloudapp.net/originpath.
     :type origin_path: str
     :param content_types_to_compress: List of content types on which
      compression applies. The value should be a valid MIME type.
@@ -78,8 +78,8 @@ class Endpoint(TrackedResource):
      routes for the CDN. This is relative to the origin path.
     :type probe_path: str
     :param geo_filters: List of rules defining the user's geo access within a
-     CDN endpoint. Each geo filter defines an acess rule to a specified path or
-     content, e.g. block APAC for path /pictures/
+     CDN endpoint. Each geo filter defines an access rule to a specified path
+     or content, e.g. block APAC for path /pictures/
     :type geo_filters: list[~azure.mgmt.cdn.models.GeoFilter]
     :param delivery_policy: A policy that specifies the delivery rules to be
      used for an endpoint.

azure-mgmt-cdn/azure/mgmt/cdn/models/endpoint_update_parameters.py

@@ -24,7 +24,7 @@ class EndpointUpdateParameters(Model):
      default.
     :type origin_host_header: str
     :param origin_path: A directory path on the origin that CDN can use to
-     retreive content from, e.g. contoso.cloudapp.net/originpath.
+     retrieve content from, e.g. contoso.cloudapp.net/originpath.
     :type origin_path: str
     :param content_types_to_compress: List of content types on which
      compression applies. The value should be a valid MIME type.
@@ -62,8 +62,8 @@ class EndpointUpdateParameters(Model):
      routes for the CDN. This is relative to the origin path.
     :type probe_path: str
     :param geo_filters: List of rules defining the user's geo access within a
-     CDN endpoint. Each geo filter defines an acess rule to a specified path or
-     content, e.g. block APAC for path /pictures/
+     CDN endpoint. Each geo filter defines an access rule to a specified path
+     or content, e.g. block APAC for path /pictures/
     :type geo_filters: list[~azure.mgmt.cdn.models.GeoFilter]
     :param delivery_policy: A policy that specifies the delivery rules to be
      used for an endpoint.

azure-mgmt-cdn/azure/mgmt/cdn/models/endpoint_update_parameters_py3.py

@@ -24,7 +24,7 @@ class EndpointUpdateParameters(Model):
      default.
     :type origin_host_header: str
     :param origin_path: A directory path on the origin that CDN can use to
-     retreive content from, e.g. contoso.cloudapp.net/originpath.
+     retrieve content from, e.g. contoso.cloudapp.net/originpath.
     :type origin_path: str
     :param content_types_to_compress: List of content types on which
      compression applies. The value should be a valid MIME type.
@@ -62,8 +62,8 @@ class EndpointUpdateParameters(Model):
      routes for the CDN. This is relative to the origin path.
     :type probe_path: str
     :param geo_filters: List of rules defining the user's geo access within a
-     CDN endpoint. Each geo filter defines an acess rule to a specified path or
-     content, e.g. block APAC for path /pictures/
+     CDN endpoint. Each geo filter defines an access rule to a specified path
+     or content, e.g. block APAC for path /pictures/
     :type geo_filters: list[~azure.mgmt.cdn.models.GeoFilter]
     :param delivery_policy: A policy that specifies the delivery rules to be
      used for an endpoint.

azure-mgmt-cdn/azure/mgmt/cdn/models/error_response.py

@@ -14,7 +14,7 @@
 
 
 class ErrorResponse(Model):
-    """Error reponse indicates CDN service is not able to process the incoming
+    """Error response indicates CDN service is not able to process the incoming
     request. The reason is provided in the error message.
 
     Variables are only populated by the server, and will be ignored when

azure-mgmt-cdn/azure/mgmt/cdn/models/error_response_py3.py

@@ -14,7 +14,7 @@
 
 
 class ErrorResponse(Model):
-    """Error reponse indicates CDN service is not able to process the incoming
+    """Error response indicates CDN service is not able to process the incoming
     request. The reason is provided in the error message.
 
     Variables are only populated by the server, and will be ignored when

azure-mgmt-cdn/azure/mgmt/cdn/operations/custom_domains_operations.py

@@ -115,7 +115,7 @@ def internal_paging(next_link=None, raw=False):
 
     def get(
             self, resource_group_name, profile_name, endpoint_name, custom_domain_name, custom_headers=None, raw=False, **operation_config):
-        """Gets an exisitng custom domain within an endpoint.
+        """Gets an existing custom domain within an endpoint.
 
         :param resource_group_name: Name of the Resource group within the
          Azure subscription.

azure-mgmt-cdn/azure/mgmt/cdn/operations/profiles_operations.py

@@ -529,7 +529,7 @@ def get_long_running_output(response):
     def generate_sso_uri(
             self, resource_group_name, profile_name, custom_headers=None, raw=False, **operation_config):
         """Generates a dynamic SSO URI used to sign in to the CDN supplemental
-        portal. Supplemnetal portal is used to configure advanced feature
+        portal. Supplemental portal is used to configure advanced feature
         capabilities that are not yet available in the Azure portal, such as
         core reports in a standard profile; rules engine, advanced HTTP
         reports, and real-time stats and alerts in a premium profile. The SSO

azure-mgmt-cdn/setup.cfg

@@ -1,3 +1,2 @@
 [bdist_wheel]
 universal=1
-azure-namespace-package=azure-mgmt-nspkg

azure-mgmt-cdn/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-mgmt-cdn"
@@ -72,13 +66,22 @@
         '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.mgmt',
+    ]),
     install_requires=[
-        'msrestazure>=0.4.27,<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-mgmt-nspkg'],
+    }
 )