Init

Author: bebound

scripts/release/pypi/build.sh

@@ -17,7 +17,7 @@ echo "Branch $branch"
 echo "Search setup files from `pwd`."
 python --version
 
-pip install -U pip setuptools wheel
+pip install -U pip setuptools wheel build
 pip list
 
 script_dir=`cd $(dirname $BASH_SOURCE[0]); pwd`
@@ -28,7 +28,6 @@ fi
 
 for setup_file in $(find src -name 'setup.py' | grep -v azure-cli-testsdk); do
     pushd `dirname $setup_file`
-    python setup.py bdist_wheel -d $BUILD_STAGINGDIRECTORY
-    python setup.py sdist -d $BUILD_STAGINGDIRECTORY
+    python -m build . -o $BUILD_STAGINGDIRECTORY
     popd
 done

src/azure-cli-core/azure/__init__.py

@@ -6,7 +6,7 @@
 # --------------------------------------------------------------------------------------------
 
 from codecs import open
-from setuptools import setup, find_packages
+from setuptools import setup, find_namespace_packages
 
 VERSION = "2.69.0"
 
@@ -80,7 +80,7 @@
     url='https://github.com/Azure/azure-cli',
     zip_safe=False,
     classifiers=CLASSIFIERS,
-    packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests", "azure", "azure.cli"]),
+    packages=find_namespace_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
     install_requires=DEPENDENCIES,
     python_requires='>=3.9.0',
     package_data={'azure.cli.core': ['auth/landing_pages/*.html']}

src/azure-cli-core/azure/cli/__init__.py

@@ -1,2 +0,0 @@
-[build_py]
-extra_build_source_files=azure.cli,__main__,azure/cli/__main__.py

src/azure-cli-core/setup.py

@@ -6,17 +6,9 @@
 # --------------------------------------------------------------------------------------------
 
 from codecs import open
-from setuptools import setup, find_packages
+from setuptools import setup, find_namespace_packages
 import sys
 
-try:
-    from azure_cli_bdist_wheel import cmdclass
-except ImportError:
-    import logging
-
-    logging.warning("Wheel is not available, disabling bdist_wheel hook")
-    cmdclass = {}
-
 VERSION = "2.69.0"
 # If we have source, validate that our version numbers match
 # This should prevent uploading releases with mismatched versions.
@@ -157,6 +149,7 @@
 with open('README.rst', 'r', encoding='utf-8') as f:
     README = f.read()
 
+
 setup(
     name='azure-cli',
     version=VERSION,
@@ -174,7 +167,7 @@
         'az.bat',
         'azps.ps1'
     ],
-    packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests", "azure", "azure.cli"]),
+    packages=find_namespace_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
     install_requires=DEPENDENCIES,
     python_requires='>=3.9.0',
     package_data={
@@ -204,6 +197,5 @@
             'random/adjectives.txt',
             'random/nouns.txt'
         ]
-    },
-    cmdclass=cmdclass
+    }
 )