From 455f36562d4d8bc029efbb4e15165a8e3b63cfc0 Mon Sep 17 00:00:00 2001 From: Xiaojian Xu Date: Tue, 16 Jun 2020 10:51:30 +0800 Subject: [PATCH 1/9] remove install nspkg in order to support pep420 --- azdev/operations/setup.py | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/azdev/operations/setup.py b/azdev/operations/setup.py index 17b5b34df..87aa4968e 100644 --- a/azdev/operations/setup.py +++ b/azdev/operations/setup.py @@ -86,10 +86,6 @@ def _install_cli(cli_path, deps=None): if deps == 'setup.py': # Resolve dependencies from setup.py files. # command modules have dependency on azure-cli-core so install this first - pip_cmd( - "install -q -e {}/src/azure-cli-nspkg".format(cli_path), - "Installing `azure-cli-nspkg`..." - ) pip_cmd( "install -q -e {}/src/azure-cli-telemetry".format(cli_path), "Installing `azure-cli-telemetry`..." @@ -108,10 +104,6 @@ def _install_cli(cli_path, deps=None): else: # First install packages without dependencies, # then resolve dependencies from requirements.*.txt file. - pip_cmd( - "install -e {}/src/azure-cli-nspkg --no-deps".format(cli_path), - "Installing `azure-cli-nspkg`..." - ) pip_cmd( "install -e {}/src/azure-cli-telemetry --no-deps".format(cli_path), "Installing `azure-cli-telemetry`..." @@ -136,11 +128,6 @@ def _install_cli(cli_path, deps=None): pip_cmd("install -r {}/src/azure-cli/{}".format(cli_path, req_file), "Installing `{}`...".format(req_file)) - # Ensure that the site package's azure/__init__.py has the old style namespace - # package declaration by installing the old namespace package - pip_cmd("install -q -I azure-nspkg==1.0.0", "Installing `azure-nspkg`...") - pip_cmd("install -q -I azure-mgmt-nspkg==1.0.0", "Installing `azure-mgmt-nspkg`...") - def _copy_config_files(): from glob import glob From 5e821bdedf803042c6ad2c273ff628b9c23d07cb Mon Sep 17 00:00:00 2001 From: Xiaojian Xu Date: Tue, 21 Jul 2020 17:05:43 +0800 Subject: [PATCH 2/9] upgrade wheel version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 43f258f1b..cbbf965b3 100644 --- a/setup.py +++ b/setup.py @@ -72,7 +72,7 @@ 'requests', 'sphinx==1.6.7', 'tox', - 'wheel==0.30.0', + 'wheel==0.34.2', 'azure-storage-blob>=1.3.1,<2.0.0', 'isort==4.3.21' ], From 173a06cb6a3212751dfcb09f0db2862644dc3c8a Mon Sep 17 00:00:00 2001 From: Xiaojian Xu Date: Mon, 3 Aug 2020 13:13:53 +0800 Subject: [PATCH 3/9] update azure_bdist_wheel.py name --- azdev/config/cli.flake8 | 2 +- azdev/operations/legal.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azdev/config/cli.flake8 b/azdev/config/cli.flake8 index 2c402923c..c407d8e79 100644 --- a/azdev/config/cli.flake8 +++ b/azdev/config/cli.flake8 @@ -9,7 +9,7 @@ ignore = C901 # code flow is too complex, too many violations, to be removed in the future W504 # line break after binary operator effect on readability is subjective exclude = - azure_bdist_wheel.py + azure_cli_bdist_wheel.py build tools scripts diff --git a/azdev/operations/legal.py b/azdev/operations/legal.py index 91cbcb3a5..7c0f2e6ae 100644 --- a/azdev/operations/legal.py +++ b/azdev/operations/legal.py @@ -54,7 +54,7 @@ def check_license_headers(): for py_file in py_files: py_file = str(py_file) - if py_file.endswith('azure_bdist_wheel.py'): + if py_file.endswith('azure_cli_bdist_wheel.py'): continue for ignore_token in _IGNORE_SUBDIRS: From 9d02ac467567c2cd60216cfb61776ffb68376f8a Mon Sep 17 00:00:00 2001 From: Xiaojian Xu Date: Tue, 18 Aug 2020 18:06:08 +0800 Subject: [PATCH 4/9] test for another_pep420 branch --- azure-pipelines.yml | 2 +- scripts/ci/install.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b36fd9189..ad4ef1e4d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -130,7 +130,7 @@ jobs: pip install pytest-cov # azdev setup - git clone --quiet https://github.com/Azure/azure-cli.git + git clone --quiet https://github.com/Azure/azure-cli.git@another_pep420 git clone --quiet https://github.com/Azure/azure-cli-extensions.git azdev setup -c ./azure-cli -r ./azure-cli-extensions diff --git a/scripts/ci/install.sh b/scripts/ci/install.sh index 24950a6ec..34ed57844 100644 --- a/scripts/ci/install.sh +++ b/scripts/ci/install.sh @@ -7,6 +7,6 @@ python -m venv env . env/bin/activate pip install -U pip setuptools wheel -q pip install $(find ${BUILD_ARTIFACTSTAGINGDIRECTORY}/pypi -name *.tar.gz) -q -git clone https://github.com/Azure/azure-cli.git +git clone https://github.com/Azure/azure-cli.git@another_pep420 git clone https://github.com/Azure/azure-cli-extensions.git azdev setup -c -r azure-cli-extensions From 3390237221c7edd6b04dff09e884127389cdb861 Mon Sep 17 00:00:00 2001 From: Xiaojian Xu Date: Tue, 18 Aug 2020 18:08:41 +0800 Subject: [PATCH 5/9] update pep420 repo --- azure-pipelines.yml | 2 +- scripts/ci/install.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ad4ef1e4d..0f89dad3c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -130,7 +130,7 @@ jobs: pip install pytest-cov # azdev setup - git clone --quiet https://github.com/Azure/azure-cli.git@another_pep420 + git clone --quiet https://github.com/arrownj/azure-cli.git@another_pep420 git clone --quiet https://github.com/Azure/azure-cli-extensions.git azdev setup -c ./azure-cli -r ./azure-cli-extensions diff --git a/scripts/ci/install.sh b/scripts/ci/install.sh index 34ed57844..9fdd2e95c 100644 --- a/scripts/ci/install.sh +++ b/scripts/ci/install.sh @@ -7,6 +7,6 @@ python -m venv env . env/bin/activate pip install -U pip setuptools wheel -q pip install $(find ${BUILD_ARTIFACTSTAGINGDIRECTORY}/pypi -name *.tar.gz) -q -git clone https://github.com/Azure/azure-cli.git@another_pep420 +git clone https://github.com/arrownj/azure-cli.git@another_pep420 git clone https://github.com/Azure/azure-cli-extensions.git azdev setup -c -r azure-cli-extensions From 7bd51e92b31fcda78bd807550c0c03b125cdbeb9 Mon Sep 17 00:00:00 2001 From: Xiaojian Xu Date: Tue, 18 Aug 2020 18:16:05 +0800 Subject: [PATCH 6/9] update branch --- azure-pipelines.yml | 2 +- scripts/ci/install.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0f89dad3c..3fb374502 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -130,7 +130,7 @@ jobs: pip install pytest-cov # azdev setup - git clone --quiet https://github.com/arrownj/azure-cli.git@another_pep420 + git clone --quiet --branch another_pep420 https://github.com/arrownj/azure-cli.git git clone --quiet https://github.com/Azure/azure-cli-extensions.git azdev setup -c ./azure-cli -r ./azure-cli-extensions diff --git a/scripts/ci/install.sh b/scripts/ci/install.sh index 9fdd2e95c..174f643e1 100644 --- a/scripts/ci/install.sh +++ b/scripts/ci/install.sh @@ -7,6 +7,6 @@ python -m venv env . env/bin/activate pip install -U pip setuptools wheel -q pip install $(find ${BUILD_ARTIFACTSTAGINGDIRECTORY}/pypi -name *.tar.gz) -q -git clone https://github.com/arrownj/azure-cli.git@another_pep420 +git clone --branch another_pep420 https://github.com/arrownj/azure-cli.git git clone https://github.com/Azure/azure-cli-extensions.git azdev setup -c -r azure-cli-extensions From e71e90b4435f45e830c8e67cdb33839146a10d7c Mon Sep 17 00:00:00 2001 From: Xiaojian Xu Date: Wed, 19 Aug 2020 11:04:06 +0800 Subject: [PATCH 7/9] rollback wheel version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index cbbf965b3..43f258f1b 100644 --- a/setup.py +++ b/setup.py @@ -72,7 +72,7 @@ 'requests', 'sphinx==1.6.7', 'tox', - 'wheel==0.34.2', + 'wheel==0.30.0', 'azure-storage-blob>=1.3.1,<2.0.0', 'isort==4.3.21' ], From 5f890f2a657b4e523e51a0bb13ec8f5a90771ce2 Mon Sep 17 00:00:00 2001 From: Xiaojian Xu Date: Wed, 19 Aug 2020 11:13:54 +0800 Subject: [PATCH 8/9] add HISTORY --- HISTORY.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/HISTORY.rst b/HISTORY.rst index 95dd0af45..07bb8d3a4 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -7,6 +7,7 @@ Release History * `azdev test`: new parameter --mark * Update the way invoking pytest * `azdev perf benchmark`: refine output +* Support PEP420 package 0.1.24 ++++++ From bba72953e85d396593a11e952195b6c161465d9f Mon Sep 17 00:00:00 2001 From: Xiaojian Xu Date: Wed, 19 Aug 2020 11:20:34 +0800 Subject: [PATCH 9/9] rollback CLI repo url --- azure-pipelines.yml | 2 +- scripts/ci/install.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3fb374502..b36fd9189 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -130,7 +130,7 @@ jobs: pip install pytest-cov # azdev setup - git clone --quiet --branch another_pep420 https://github.com/arrownj/azure-cli.git + git clone --quiet https://github.com/Azure/azure-cli.git git clone --quiet https://github.com/Azure/azure-cli-extensions.git azdev setup -c ./azure-cli -r ./azure-cli-extensions diff --git a/scripts/ci/install.sh b/scripts/ci/install.sh index 174f643e1..24950a6ec 100644 --- a/scripts/ci/install.sh +++ b/scripts/ci/install.sh @@ -7,6 +7,6 @@ python -m venv env . env/bin/activate pip install -U pip setuptools wheel -q pip install $(find ${BUILD_ARTIFACTSTAGINGDIRECTORY}/pypi -name *.tar.gz) -q -git clone --branch another_pep420 https://github.com/arrownj/azure-cli.git +git clone https://github.com/Azure/azure-cli.git git clone https://github.com/Azure/azure-cli-extensions.git azdev setup -c -r azure-cli-extensions