Skip to content

Commit 4f66638

Browse files
authored
remove install nspkg in order to support pep420 (#240)
* remove install nspkg in order to support pep420 * upgrade wheel version * update azure_bdist_wheel.py name * test for another_pep420 branch * update pep420 repo * update branch * rollback wheel version * add HISTORY * rollback CLI repo url
1 parent 8571cf7 commit 4f66638

4 files changed

Lines changed: 3 additions & 15 deletions

File tree

HISTORY.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Release History
77
* `azdev test`: new parameter --mark
88
* Update the way invoking pytest
99
* `azdev perf benchmark`: refine output
10+
* Support PEP420 package
1011

1112
0.1.24
1213
++++++

azdev/config/cli.flake8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ignore =
99
C901 # code flow is too complex, too many violations, to be removed in the future
1010
W504 # line break after binary operator effect on readability is subjective
1111
exclude =
12-
azure_bdist_wheel.py
12+
azure_cli_bdist_wheel.py
1313
build
1414
tools
1515
scripts

azdev/operations/legal.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def check_license_headers():
5454
for py_file in py_files:
5555
py_file = str(py_file)
5656

57-
if py_file.endswith('azure_bdist_wheel.py'):
57+
if py_file.endswith('azure_cli_bdist_wheel.py'):
5858
continue
5959

6060
for ignore_token in _IGNORE_SUBDIRS:

azdev/operations/setup.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,6 @@ def _install_cli(cli_path, deps=None):
8686
if deps == 'setup.py':
8787
# Resolve dependencies from setup.py files.
8888
# command modules have dependency on azure-cli-core so install this first
89-
pip_cmd(
90-
"install -q -e {}/src/azure-cli-nspkg".format(cli_path),
91-
"Installing `azure-cli-nspkg`..."
92-
)
9389
pip_cmd(
9490
"install -q -e {}/src/azure-cli-telemetry".format(cli_path),
9591
"Installing `azure-cli-telemetry`..."
@@ -108,10 +104,6 @@ def _install_cli(cli_path, deps=None):
108104
else:
109105
# First install packages without dependencies,
110106
# then resolve dependencies from requirements.*.txt file.
111-
pip_cmd(
112-
"install -e {}/src/azure-cli-nspkg --no-deps".format(cli_path),
113-
"Installing `azure-cli-nspkg`..."
114-
)
115107
pip_cmd(
116108
"install -e {}/src/azure-cli-telemetry --no-deps".format(cli_path),
117109
"Installing `azure-cli-telemetry`..."
@@ -136,11 +128,6 @@ def _install_cli(cli_path, deps=None):
136128
pip_cmd("install -r {}/src/azure-cli/{}".format(cli_path, req_file),
137129
"Installing `{}`...".format(req_file))
138130

139-
# Ensure that the site package's azure/__init__.py has the old style namespace
140-
# package declaration by installing the old namespace package
141-
pip_cmd("install -q -I azure-nspkg==1.0.0", "Installing `azure-nspkg`...")
142-
pip_cmd("install -q -I azure-mgmt-nspkg==1.0.0", "Installing `azure-mgmt-nspkg`...")
143-
144131

145132
def _copy_config_files():
146133
from glob import glob

0 commit comments

Comments
 (0)