Skip to content
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.

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

{Package} Migrate CLI packaging system to PEP 420 Implicit Namespace Packages #14372

Merged
merged 78 commits into from
Aug 19, 2020
Merged
Changes from 1 commit
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
409a919
init pep420 change
arrownj Jul 13, 2020
2eaa836
fix linter error
arrownj Jul 13, 2020
13fe8e2
fix another linter error
arrownj Jul 13, 2020
8d8b52c
elegant way to handle __main__.py
arrownj Jul 15, 2020
6e23b62
remove nspkg
arrownj Jul 15, 2020
9a97ee4
refactor azure_bdist_wheel to fit wheel 0.34.2
arrownj Jul 16, 2020
b491f97
add namespace package __init__.py to sdist
arrownj Jul 16, 2020
3687e19
fix merge conflict
arrownj Jul 16, 2020
2304e2b
fix generic update problem
arrownj Jul 20, 2020
1a286fd
fix merge conflict
arrownj Jul 20, 2020
dda178c
upgrade telemetry version
arrownj Jul 21, 2020
efd134e
upgrade telemetry version
arrownj Jul 21, 2020
b8f203d
rollback some useless change
arrownj Jul 21, 2020
4d18448
build yum/deb/homebrew etx
arrownj Jul 21, 2020
c5d2930
use template to generate formula
arrownj Jul 22, 2020
c1e76ea
update build.cmd
arrownj Jul 22, 2020
0a1c170
update build scripts
arrownj Jul 22, 2020
d895720
upgrade azure-mutliapi-storage to 0.3.6
arrownj Jul 27, 2020
c8166bc
fix debian build script
arrownj Jul 27, 2020
1602765
fix merge conflict
arrownj Jul 27, 2020
09b7101
init pep420 change
arrownj Jul 13, 2020
1dc87c1
fix linter error
arrownj Jul 13, 2020
6a06121
fix another linter error
arrownj Jul 13, 2020
a16c155
elegant way to handle __main__.py
arrownj Jul 15, 2020
a61214f
remove nspkg
arrownj Jul 15, 2020
e5704c9
refactor azure_bdist_wheel to fit wheel 0.34.2
arrownj Jul 16, 2020
0a0edab
add namespace package __init__.py to sdist
arrownj Jul 16, 2020
99cb087
fix merge conflict
arrownj Jul 16, 2020
d446a63
fix generic update problem
arrownj Jul 20, 2020
7197682
fix merge conflict
arrownj Jul 20, 2020
a43aac5
upgrade telemetry version
arrownj Jul 21, 2020
ed508fa
upgrade telemetry version
arrownj Jul 21, 2020
0b73c30
rollback some useless change
arrownj Jul 21, 2020
944f72f
build yum/deb/homebrew etx
arrownj Jul 21, 2020
c348606
use template to generate formula
arrownj Jul 22, 2020
c5a3468
update build.cmd
arrownj Jul 22, 2020
ac40971
update build scripts
arrownj Jul 22, 2020
48240f0
upgrade azure-mutliapi-storage to 0.3.6
arrownj Jul 27, 2020
6bd5326
fix debian build script
arrownj Jul 27, 2020
2a486a8
fix merge conflict
arrownj Jul 27, 2020
5f65b2e
fix merge conflict
arrownj Jul 29, 2020
d004fcc
Merge branch 'another_pep420' of github.com:arrownj/azure-cli into an…
arrownj Jul 30, 2020
46bd50f
fix generic update test problem
arrownj Jul 30, 2020
2bfc20e
remove extra __init__.py
arrownj Jul 30, 2020
703c683
Merge branch 'dev' into another_pep420
arrownj Jul 30, 2020
4fcf574
remove __init__.pyc file in debian and rpm
arrownj Jul 31, 2020
53569e5
update build wheel stratages
arrownj Aug 3, 2020
36417c4
Merge branch 'dev' into another_pep420
arrownj Aug 3, 2020
4d87e27
update version
arrownj Aug 3, 2020
8206299
update build scripts
arrownj Aug 3, 2020
81fbb36
fix webapp test error
arrownj Aug 3, 2020
7f47f19
add __main__.py in sdist
arrownj Aug 3, 2020
6dbf584
Merge branch 'dev' into another_pep420
arrownj Aug 3, 2020
7cec6fb
add test homebrew package scripts
arrownj Aug 11, 2020
9dda359
Merge branch 'dev' into another_pep420
arrownj Aug 11, 2020
e3087c5
update version value in __main__.py
arrownj Aug 11, 2020
525de65
make test_homebrew_package.sh executable
arrownj Aug 11, 2020
dea113d
fix homebrew permission problem
arrownj Aug 11, 2020
22fef1e
fix error
arrownj Aug 12, 2020
1623787
skip some acr tests
arrownj Aug 13, 2020
acbdbc6
fix style error
arrownj Aug 13, 2020
6b5db1a
skip config tests
arrownj Aug 17, 2020
b254fdb
fix config test MAC error
arrownj Aug 17, 2020
866972d
fix role config test error
arrownj Aug 17, 2020
46883bc
Merge branch 'dev' into another_pep420
arrownj Aug 17, 2020
ded0f26
fix test error
arrownj Aug 17, 2020
7e2fe75
fix test error
arrownj Aug 17, 2020
16f6aff
workaround for vsts bug
arrownj Aug 17, 2020
31e7934
fix test error
arrownj Aug 17, 2020
5c2a43d
fix homebrew test error
arrownj Aug 18, 2020
fec21db
fix configure test error
arrownj Aug 18, 2020
366e22f
Merge remote-tracking branch 'upstream/dev' into another_pep420
arrownj Aug 18, 2020
b35b767
update homebrew package job timeout value
arrownj Aug 18, 2020
5ccc96c
use released azdev
arrownj Aug 19, 2020
225a8c4
Merge branch 'dev' into another_pep420
arrownj Aug 19, 2020
12403e8
rollback pipelines
arrownj Aug 19, 2020
ede06e0
rollback pipelines 2
arrownj Aug 19, 2020
320bd06
refactor config test
arrownj Aug 19, 2020
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
Prev Previous commit
Next Next commit
init pep420 change
arrownj committed Jul 29, 2020
commit 09b7101ea4c6308cf3f7568a754e671e8276c387
5 changes: 5 additions & 0 deletions .azure-pipelines/templates/azdev_setup.yml
Original file line number Diff line number Diff line change
@@ -14,7 +14,12 @@ steps:
chmod +x env/bin/activate
. env/bin/activate

<<<<<<< HEAD
pip install -q azdev==0.1.22
=======
pip install -q git+https://github.com/Azure/azure-cli-dev-tools.git@pep420

>>>>>>> init pep420 change
azdev --version

if [ -z "$CLI_EXT_REPO_PATH" ]; then
16 changes: 16 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -140,7 +140,23 @@ jobs:
displayName: 'Use Python 3.7'
inputs:
versionSpec: 3.7
<<<<<<< HEAD
- template: .azure-pipelines/templates/azdev_setup.yml
=======

- bash: |
#!/usr/bin/env bash

set -ev

pip install virtualenv
python -m virtualenv venv/
. ./venv/bin/activate
pip install -q git+https://github.com/Azure/azure-cli-dev-tools.git@pep420
azdev setup -c $(pwd)
displayName: 'Install azdev'

>>>>>>> init pep420 change
- bash: |
set -ev
. env/bin/activate
3 changes: 1 addition & 2 deletions build_scripts/windows/scripts/build.cmd
Original file line number Diff line number Diff line change
@@ -88,7 +88,7 @@ robocopy %PYTHON_DIR% %BUILDING_DIR% /s /NFL /NDL

set CLI_SRC=%REPO_ROOT%\src
%BUILDING_DIR%\python.exe -m pip install --no-warn-script-location --force-reinstall pycparser==2.18
for %%a in (%CLI_SRC%\azure-cli %CLI_SRC%\azure-cli-core %CLI_SRC%\azure-cli-nspkg %CLI_SRC%\azure-cli-telemetry) do (
for %%a in (%CLI_SRC%\azure-cli %CLI_SRC%\azure-cli-core %CLI_SRC%\azure-cli-telemetry) do (
pushd %%a
%BUILDING_DIR%\python.exe -m pip install --no-warn-script-location --no-cache-dir --no-deps .
popd
@@ -97,7 +97,6 @@ for %%a in (%CLI_SRC%\azure-cli %CLI_SRC%\azure-cli-core %CLI_SRC%\azure-cli-nsp

if %errorlevel% neq 0 goto ERROR

%BUILDING_DIR%\python.exe -m pip install --no-warn-script-location --force-reinstall --upgrade azure-nspkg azure-mgmt-nspkg
%BUILDING_DIR%\python.exe -m pip install --no-warn-script-location --force-reinstall urllib3==1.24.2

pushd %BUILDING_DIR%
12 changes: 12 additions & 0 deletions scripts/ci/install_azdev.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/usr/bin/env bash
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file should be deleted as well.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this file is not referenced anywhere.


set -e

echo "Install azdev into virtual environment"
export CI="ADO"
pip install virtualenv
python -m virtualenv env
. env/bin/activate
pip install -U pip setuptools wheel -q
pip install -q git+https://github.com/Azure/azure-cli-dev-tools.git@pep420
azdev setup -c
19 changes: 0 additions & 19 deletions src/azure-cli-command_modules-nspkg/HISTORY.rst

This file was deleted.

1 change: 0 additions & 1 deletion src/azure-cli-command_modules-nspkg/MANIFEST.in

This file was deleted.

8 changes: 0 additions & 8 deletions src/azure-cli-command_modules-nspkg/README.rst

This file was deleted.

Empty file.
Empty file.
49 changes: 0 additions & 49 deletions src/azure-cli-command_modules-nspkg/setup.py

This file was deleted.

3 changes: 1 addition & 2 deletions src/azure-cli-core/azure/__init__.py
Original file line number Diff line number Diff line change
@@ -2,5 +2,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------
import pkg_resources
pkg_resources.declare_namespace(__name__)
__path__ = __import__("pkgutil").extend_path(__path__, __name__)
3 changes: 1 addition & 2 deletions src/azure-cli-core/azure/cli/__init__.py
Original file line number Diff line number Diff line change
@@ -2,5 +2,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------
import pkg_resources
pkg_resources.declare_namespace(__name__)
__path__ = __import__("pkgutil").extend_path(__path__, __name__)
2 changes: 0 additions & 2 deletions src/azure-cli-core/setup.py
Original file line number Diff line number Diff line change
@@ -92,8 +92,6 @@
zip_safe=False,
classifiers=CLASSIFIERS,
packages=[
'azure',
'azure.cli',
'azure.cli.core',
'azure.cli.core.commands',
'azure.cli.core.extension',
44 changes: 0 additions & 44 deletions src/azure-cli-nspkg/HISTORY.rst

This file was deleted.

1 change: 0 additions & 1 deletion src/azure-cli-nspkg/MANIFEST.in

This file was deleted.

8 changes: 0 additions & 8 deletions src/azure-cli-nspkg/README.rst

This file was deleted.

Empty file.
Empty file removed src/azure-cli-nspkg/setup.cfg
Empty file.
48 changes: 0 additions & 48 deletions src/azure-cli-nspkg/setup.py

This file was deleted.

3 changes: 1 addition & 2 deletions src/azure-cli-telemetry/azure/__init__.py
Original file line number Diff line number Diff line change
@@ -2,5 +2,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------
import pkg_resources
pkg_resources.declare_namespace(__name__)
__path__ = __import__("pkgutil").extend_path(__path__, __name__)
4 changes: 1 addition & 3 deletions src/azure-cli-telemetry/azure/cli/__init__.py
Original file line number Diff line number Diff line change
@@ -2,6 +2,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------
import pkg_resources

pkg_resources.declare_namespace(__name__)
__path__ = __import__("pkgutil").extend_path(__path__, __name__)
2 changes: 0 additions & 2 deletions src/azure-cli-telemetry/setup.py
Original file line number Diff line number Diff line change
@@ -51,8 +51,6 @@
'portalocker~=1.2',
],
packages=[
'azure',
'azure.cli',
'azure.cli.telemetry',
'azure.cli.telemetry.components'
],
4 changes: 1 addition & 3 deletions src/azure-cli-testsdk/azure/__init__.py
Original file line number Diff line number Diff line change
@@ -2,6 +2,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------

import pkg_resources
pkg_resources.declare_namespace(__name__)
__path__ = __import__("pkgutil").extend_path(__path__, __name__)
4 changes: 1 addition & 3 deletions src/azure-cli-testsdk/azure/cli/__init__.py
Original file line number Diff line number Diff line change
@@ -2,6 +2,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------

import pkg_resources
pkg_resources.declare_namespace(__name__)
__path__ = __import__("pkgutil").extend_path(__path__, __name__)
2 changes: 0 additions & 2 deletions src/azure-cli-testsdk/setup.py
Original file line number Diff line number Diff line change
@@ -51,8 +51,6 @@
zip_safe=False,
classifiers=CLASSIFIERS,
packages=[
'azure',
'azure.cli',
'azure.cli.testsdk'
],
install_requires=DEPENDENCIES,
1 change: 1 addition & 0 deletions src/azure-cli/README.rst
Original file line number Diff line number Diff line change
@@ -103,3 +103,4 @@ License
=======

`MIT <https://github.com/Azure/azure-cli/blob/master/LICENSE.txt>`__

3 changes: 1 addition & 2 deletions src/azure-cli/azure/__init__.py
Original file line number Diff line number Diff line change
@@ -2,5 +2,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------
import pkg_resources
pkg_resources.declare_namespace(__name__)
__path__ = __import__("pkgutil").extend_path(__path__, __name__)
8 changes: 1 addition & 7 deletions src/azure-cli/azure/cli/__init__.py
Original file line number Diff line number Diff line change
@@ -2,13 +2,7 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------
'''The Azure Command-line tool.

This tools provides a command-line interface to Azure's management and storage
APIs.
'''
import pkg_resources
pkg_resources.declare_namespace(__name__)
__path__ = __import__("pkgutil").extend_path(__path__, __name__)

__author__ = "Microsoft Corporation <[email protected]>"
__version__ = "2.9.1"
Original file line number Diff line number Diff line change
@@ -14,9 +14,7 @@ class VersionTest(ScenarioTest):
def test_version(self):
output = self.cmd('az version').get_output_in_json()
self.assertIn('azure-cli', output)
self.assertIn('azure-cli-command-modules-nspkg', output)
self.assertIn('azure-cli-core', output)
self.assertIn('azure-cli-nspkg', output)
self.assertIn('azure-cli-telemetry', output)
self.assertIn('azure-cli-testsdk', output)
self.assertIn('extensions', output)
11 changes: 7 additions & 4 deletions src/azure-cli/requirements.py3.Darwin.txt
Original file line number Diff line number Diff line change
@@ -4,13 +4,18 @@ applicationinsights==0.11.9
argcomplete==1.11.1
asn1crypto==0.24.0
azure-batch==9.0.0
<<<<<<< HEAD
azure-cli==2.9.1
azure-cli-command-modules-nspkg==2.0.3
azure-cli-core==2.9.1
azure-cli-nspkg==3.0.4
=======
azure-cli==2.9.0
azure-cli-core==2.9.0
>>>>>>> init pep420 change
azure-cli-telemetry==1.0.4
azure-common==1.1.22
azure-cosmos==3.1.0
azure-cosmos==3.2.0
azure-datalake-store==0.0.48
azure-devtools==1.2.0
azure-functions-devops-build==0.0.22
@@ -59,7 +64,6 @@ azure-mgmt-monitor==0.11.0
azure-mgmt-msi==0.2.0
azure-mgmt-netapp==0.8.0
azure-mgmt-network==11.0.0
azure-mgmt-nspkg==3.0.2
azure-mgmt-policyinsights==0.5.0
azure-mgmt-privatedns==0.1.0
azure-mgmt-rdbms==2.2.0
@@ -80,8 +84,7 @@ azure-mgmt-sqlvirtualmachine==0.5.0
azure-mgmt-storage==11.1.0
azure-mgmt-trafficmanager==0.51.0
azure-mgmt-web==0.47.0
azure-multiapi-storage==0.3.2
azure-nspkg==3.0.2
azure-multiapi-storage==0.3.5
azure-loganalytics==0.1.0
azure-storage-common==1.4.2
bcrypt==3.1.7
Loading