Skip to content

remove install nspkg in order to support pep420 #240

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

Merged
arrownj merged 9 commits into from
Aug 19, 2020
Merged

remove install nspkg in order to support pep420 #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
455f365
remove install nspkg in order to support pep420
arrownj Jun 16, 2020
5e821bd
upgrade wheel version
arrownj Jul 21, 2020
173a06c
update azure_bdist_wheel.py name
arrownj Aug 3, 2020
9d02ac4
test for another_pep420 branch
arrownj Aug 18, 2020
3390237
update pep420 repo
arrownj Aug 18, 2020
7bd51e9
update branch
arrownj Aug 18, 2020
e71e90b
rollback wheel version
arrownj Aug 19, 2020
5f890f2
add HISTORY
arrownj Aug 19, 2020
bba7295
rollback CLI repo url
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
1 change: 1 addition & 0 deletions HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
++++++
Expand Down
2 changes: 1 addition & 1 deletion azdev/config/cli.flake8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion azdev/operations/legal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
13 changes: 0 additions & 13 deletions azdev/operations/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`..."
Expand All @@ -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`..."
Expand All @@ -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
Expand Down