Skip to content

{Packaging} Use native namespace packages #30876

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
bebound wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

{Packaging} Use native namespace packages #30876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions scripts/release/pypi/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand All @@ -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
5 changes: 0 additions & 5 deletions src/azure-cli-core/azure/__init__.py
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions src/azure-cli-core/azure/cli/__init__.py
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/azure-cli-core/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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']}
Expand Down
5 changes: 0 additions & 5 deletions src/azure-cli/azure/__init__.py
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions src/azure-cli/azure/cli/__init__.py
View file
Open in desktop

This file was deleted.

Empty file removed src/azure-cli/azure/cli/command_modules/__init__.py
View file
Open in desktop
Empty file.
25 changes: 0 additions & 25 deletions src/azure-cli/azure_cli_bdist_wheel.py
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions src/azure-cli/setup.cfg
View file
Open in desktop

This file was deleted.

16 changes: 4 additions & 12 deletions src/azure-cli/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -157,6 +149,7 @@
with open('README.rst', 'r', encoding='utf-8') as f:
README = f.read()


setup(
name='azure-cli',
version=VERSION,
Expand All @@ -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={
Expand Down Expand Up @@ -204,6 +197,5 @@
'random/adjectives.txt',
'random/nouns.txt'
]
},
cmdclass=cmdclass
}
)
Loading