New packaging system for all packages

sandeepnl · Mar 30, 2017 · e57bb60 · e57bb60
1 parent bff2a6e
commit e57bb60
Show file tree

Hide file tree

Showing 144 changed files with 2,005 additions and 77 deletions.
diff --git a/azure-batch/MANIFEST.in b/azure-batch/MANIFEST.in
@@ -1,2 +1,2 @@
 include *.rst
-exclude azure/__init__.py
+include azure_wheel.py
diff --git a/azure-batch/azure_wheel.py b/azure-batch/azure_wheel.py
@@ -0,0 +1,53 @@
+#-------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#--------------------------------------------------------------------------
+
+from distutils import log as logger
+import os.path
+try:
+    from wheel.bdist_wheel import bdist_wheel as original_bdist_wheel
+    class bdist_wheel(original_bdist_wheel):
+
+        description = "Create an Azure wheel distribution"
+
+        user_options = original_bdist_wheel.user_options + \
+            [('azure-namespace-package=', None,
+              "Name of the deepest nspkg used")]
+
+        def initialize_options(self):
+            original_bdist_wheel.initialize_options(self)
+            self.azure_namespace_package = None
+
+        def finalize_options(self):
+            original_bdist_wheel.finalize_options(self)
+            if self.azure_namespace_package and not self.azure_namespace_package.endswith("-nspkg"):
+                raise ValueError("azure_namespace_package must finish by -nspkg")
+
+        def run(self):
+            if not self.distribution.install_requires:
+                self.distribution.install_requires = []
+            self.distribution.install_requires.append(
+                "{}>=2.0.0".format(self.azure_namespace_package))
+            original_bdist_wheel.run(self)
+
+        def write_record(self, bdist_dir, distinfo_dir):
+            if self.azure_namespace_package:
+                # Split and remove last part, assuming it's "nspkg"
+                subparts = self.azure_namespace_package.split('-')[0:-1]
+            folder_with_init = [os.path.join(*subparts[0:i+1]) for i in range(len(subparts))]
+            for azure_sub_package in folder_with_init:
+                init_file = os.path.join(bdist_dir, azure_sub_package, '__init__.py')
+                if os.path.isfile(init_file):
+                    logger.info("manually remove {} while building the wheel".format(init_file))
+                    os.remove(init_file)
+                else:
+                    raise ValueError("Unable to find {}. Are you sure of your namespace package?".format(init_file))
+            original_bdist_wheel.write_record(self, bdist_dir, distinfo_dir)
+    cmdclass = {
+        'bdist_wheel': bdist_wheel,
+    }
+except ImportError:
+    logger.warn("Wheel is not available, disabling bdist_wheel hook")
+    cmdclass = {}
diff --git a/azure-batch/setup.cfg b/azure-batch/setup.cfg
@@ -1,5 +1,6 @@
 [bdist_wheel]
 universal=1
+azure-namespace-package=azure-nspkg
 
 [install]
 single-version-externally-managed=1

diff --git a/azure-batch/setup.py b/azure-batch/setup.py
@@ -7,6 +7,7 @@
 #--------------------------------------------------------------------------
 
 from setuptools import find_packages, setup
+from azure_wheel import cmdclass
 from io import open
 import re
 import os.path
@@ -75,4 +76,5 @@
         'azure-common~=1.1.4',
         'msrestazure~=0.4.7',
     ],
+    cmdclass=cmdclass
 )
diff --git a/azure-common/azure_wheel.py b/azure-common/azure_wheel.py
@@ -26,13 +26,13 @@ def finalize_options(self):
                 raise ValueError("azure_namespace_package must finish by -nspkg")
 
         def run(self):
+            if not self.distribution.install_requires:
+                self.distribution.install_requires = []
             self.distribution.install_requires.append(
                 "{}>=2.0.0".format(self.azure_namespace_package))
             original_bdist_wheel.run(self)
 
         def write_record(self, bdist_dir, distinfo_dir):
-            # following check could be improved, by parsing the package name
-            # package_name = self.distribution.get_name()
             if self.azure_namespace_package:
                 # Split and remove last part, assuming it's "nspkg"
                 subparts = self.azure_namespace_package.split('-')[0:-1]

diff --git a/azure-graphrbac/MANIFEST.in b/azure-graphrbac/MANIFEST.in
@@ -1,3 +1,2 @@
 include *.rst
-exclude azure/__init__.py
-exclude azure/mgmt/__init__.py
+include azure_wheel.py
diff --git a/azure-graphrbac/azure_wheel.py b/azure-graphrbac/azure_wheel.py
@@ -0,0 +1,53 @@
+#-------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#--------------------------------------------------------------------------
+
+from distutils import log as logger
+import os.path
+try:
+    from wheel.bdist_wheel import bdist_wheel as original_bdist_wheel
+    class bdist_wheel(original_bdist_wheel):
+
+        description = "Create an Azure wheel distribution"
+
+        user_options = original_bdist_wheel.user_options + \
+            [('azure-namespace-package=', None,
+              "Name of the deepest nspkg used")]
+
+        def initialize_options(self):
+            original_bdist_wheel.initialize_options(self)
+            self.azure_namespace_package = None
+
+        def finalize_options(self):
+            original_bdist_wheel.finalize_options(self)
+            if self.azure_namespace_package and not self.azure_namespace_package.endswith("-nspkg"):
+                raise ValueError("azure_namespace_package must finish by -nspkg")
+
+        def run(self):
+            if not self.distribution.install_requires:
+                self.distribution.install_requires = []
+            self.distribution.install_requires.append(
+                "{}>=2.0.0".format(self.azure_namespace_package))
+            original_bdist_wheel.run(self)
+
+        def write_record(self, bdist_dir, distinfo_dir):
+            if self.azure_namespace_package:
+                # Split and remove last part, assuming it's "nspkg"
+                subparts = self.azure_namespace_package.split('-')[0:-1]
+            folder_with_init = [os.path.join(*subparts[0:i+1]) for i in range(len(subparts))]
+            for azure_sub_package in folder_with_init:
+                init_file = os.path.join(bdist_dir, azure_sub_package, '__init__.py')
+                if os.path.isfile(init_file):
+                    logger.info("manually remove {} while building the wheel".format(init_file))
+                    os.remove(init_file)
+                else:
+                    raise ValueError("Unable to find {}. Are you sure of your namespace package?".format(init_file))
+            original_bdist_wheel.write_record(self, bdist_dir, distinfo_dir)
+    cmdclass = {
+        'bdist_wheel': bdist_wheel,
+    }
+except ImportError:
+    logger.warn("Wheel is not available, disabling bdist_wheel hook")
+    cmdclass = {}
diff --git a/azure-graphrbac/setup.cfg b/azure-graphrbac/setup.cfg
@@ -1,5 +1,6 @@
 [bdist_wheel]
 universal=1
+azure-namespace-package=azure-nspkg
 
 [install]
 single-version-externally-managed=1

diff --git a/azure-graphrbac/setup.py b/azure-graphrbac/setup.py
@@ -7,6 +7,7 @@
 #--------------------------------------------------------------------------
 
 from setuptools import setup
+from azure_wheel import cmdclass
 from io import open
 import re
 
@@ -70,4 +71,5 @@
         'azure-common~=1.1.4',
         'msrestazure~=0.4.6',
     ],
+    cmdclass=cmdclass
 )
diff --git a/azure-keyvault/MANIFEST.in b/azure-keyvault/MANIFEST.in
@@ -1,2 +1,2 @@
 include *.rst
-exclude azure/__init__.py
+include azure_wheel.py
diff --git a/azure-keyvault/azure_wheel.py b/azure-keyvault/azure_wheel.py
@@ -0,0 +1,53 @@
+#-------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#--------------------------------------------------------------------------
+
+from distutils import log as logger
+import os.path
+try:
+    from wheel.bdist_wheel import bdist_wheel as original_bdist_wheel
+    class bdist_wheel(original_bdist_wheel):
+
+        description = "Create an Azure wheel distribution"
+
+        user_options = original_bdist_wheel.user_options + \
+            [('azure-namespace-package=', None,
+              "Name of the deepest nspkg used")]
+
+        def initialize_options(self):
+            original_bdist_wheel.initialize_options(self)
+            self.azure_namespace_package = None
+
+        def finalize_options(self):
+            original_bdist_wheel.finalize_options(self)
+            if self.azure_namespace_package and not self.azure_namespace_package.endswith("-nspkg"):
+                raise ValueError("azure_namespace_package must finish by -nspkg")
+
+        def run(self):
+            if not self.distribution.install_requires:
+                self.distribution.install_requires = []
+            self.distribution.install_requires.append(
+                "{}>=2.0.0".format(self.azure_namespace_package))
+            original_bdist_wheel.run(self)
+
+        def write_record(self, bdist_dir, distinfo_dir):
+            if self.azure_namespace_package:
+                # Split and remove last part, assuming it's "nspkg"
+                subparts = self.azure_namespace_package.split('-')[0:-1]
+            folder_with_init = [os.path.join(*subparts[0:i+1]) for i in range(len(subparts))]
+            for azure_sub_package in folder_with_init:
+                init_file = os.path.join(bdist_dir, azure_sub_package, '__init__.py')
+                if os.path.isfile(init_file):
+                    logger.info("manually remove {} while building the wheel".format(init_file))
+                    os.remove(init_file)
+                else:
+                    raise ValueError("Unable to find {}. Are you sure of your namespace package?".format(init_file))
+            original_bdist_wheel.write_record(self, bdist_dir, distinfo_dir)
+    cmdclass = {
+        'bdist_wheel': bdist_wheel,
+    }
+except ImportError:
+    logger.warn("Wheel is not available, disabling bdist_wheel hook")
+    cmdclass = {}
diff --git a/azure-keyvault/setup.cfg b/azure-keyvault/setup.cfg
@@ -1,5 +1,6 @@
 [bdist_wheel]
 universal=1
+azure-namespace-package=azure-nspkg
 
 [install]
 single-version-externally-managed=1

diff --git a/azure-keyvault/setup.py b/azure-keyvault/setup.py
@@ -7,6 +7,7 @@
 #--------------------------------------------------------------------------
 
 from setuptools import find_packages, setup
+from azure_wheel import cmdclass
 from io import open
 import re
 import os.path
@@ -37,7 +38,7 @@
 
 #For KeyVault only
 package_folder_path = os.path.join(package_folder_path, 'generated')
-	
+    
 # Version extraction inspired from 'requests'
 with open(os.path.join(package_folder_path, 'version.py'), 'r') as fd:
     version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]',
@@ -78,4 +79,5 @@
         'azure-common~=1.1.4',
         'msrestazure~=0.4.6',
     ],
+    cmdclass=cmdclass
 )
diff --git a/azure-mgmt-authorization/MANIFEST.in b/azure-mgmt-authorization/MANIFEST.in
@@ -1,3 +1,2 @@
 include *.rst
-exclude azure/__init__.py
-exclude azure/mgmt/__init__.py
+include azure_wheel.py
diff --git a/azure-mgmt-authorization/azure_wheel.py b/azure-mgmt-authorization/azure_wheel.py
@@ -0,0 +1,53 @@
+#-------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#--------------------------------------------------------------------------
+
+from distutils import log as logger
+import os.path
+try:
+    from wheel.bdist_wheel import bdist_wheel as original_bdist_wheel
+    class bdist_wheel(original_bdist_wheel):
+
+        description = "Create an Azure wheel distribution"
+
+        user_options = original_bdist_wheel.user_options + \
+            [('azure-namespace-package=', None,
+              "Name of the deepest nspkg used")]
+
+        def initialize_options(self):
+            original_bdist_wheel.initialize_options(self)
+            self.azure_namespace_package = None
+
+        def finalize_options(self):
+            original_bdist_wheel.finalize_options(self)
+            if self.azure_namespace_package and not self.azure_namespace_package.endswith("-nspkg"):
+                raise ValueError("azure_namespace_package must finish by -nspkg")
+
+        def run(self):
+            if not self.distribution.install_requires:
+                self.distribution.install_requires = []
+            self.distribution.install_requires.append(
+                "{}>=2.0.0".format(self.azure_namespace_package))
+            original_bdist_wheel.run(self)
+
+        def write_record(self, bdist_dir, distinfo_dir):
+            if self.azure_namespace_package:
+                # Split and remove last part, assuming it's "nspkg"
+                subparts = self.azure_namespace_package.split('-')[0:-1]
+            folder_with_init = [os.path.join(*subparts[0:i+1]) for i in range(len(subparts))]
+            for azure_sub_package in folder_with_init:
+                init_file = os.path.join(bdist_dir, azure_sub_package, '__init__.py')
+                if os.path.isfile(init_file):
+                    logger.info("manually remove {} while building the wheel".format(init_file))
+                    os.remove(init_file)
+                else:
+                    raise ValueError("Unable to find {}. Are you sure of your namespace package?".format(init_file))
+            original_bdist_wheel.write_record(self, bdist_dir, distinfo_dir)
+    cmdclass = {
+        'bdist_wheel': bdist_wheel,
+    }
+except ImportError:
+    logger.warn("Wheel is not available, disabling bdist_wheel hook")
+    cmdclass = {}
diff --git a/azure-mgmt-authorization/setup.cfg b/azure-mgmt-authorization/setup.cfg
@@ -1,5 +1,6 @@
 [bdist_wheel]
 universal=1
+azure-namespace-package=azure-mgmt-nspkg
 
 [install]
 single-version-externally-managed=1

diff --git a/azure-mgmt-authorization/setup.py b/azure-mgmt-authorization/setup.py
@@ -7,6 +7,7 @@
 #--------------------------------------------------------------------------
 
 from setuptools import setup
+from azure_wheel import cmdclass
 import re
 
 # azure v0.x is not compatible with this package
@@ -66,4 +67,5 @@
         'msrestazure~=0.4.6',
         'azure-mgmt-nspkg',
     ],
+    cmdclass=cmdclass
 )
diff --git a/azure-mgmt-batch/MANIFEST.in b/azure-mgmt-batch/MANIFEST.in
@@ -1,3 +1,2 @@
 include *.rst
-exclude azure/__init__.py
-exclude azure/mgmt/__init__.py
+include azure_wheel.py