Skip to content

{Packaging/windows pip} Use local python for az.bat #12323

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
Feng Zhou (fengzhou-msft) merged 2 commits into from
Mar 2, 2020
Merged

{Packaging/windows pip} Use local python for az.bat #12323

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a28dee
use local python for az.bat
fengzhou-msft Feb 22, 2020
f5810ef
Update az.bat
fengzhou-msft Feb 25, 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
8 changes: 6 additions & 2 deletions src/azure-cli/az.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
@echo off
setlocal

SET PYTHONPATH=%~dp0/src;%PYTHONPATH%
python -m azure.cli %*
IF EXIST "%~dp0\python.exe" (
"%~dp0\python.exe" -m azure.cli %*
) ELSE (
SET PYTHONPATH=%~dp0/src;%PYTHONPATH%

@jiasli Jiashuo Li (jiasli) Feb 25, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think PYTHONPATH is not necessary anymore. By showing it with echo %PYTHONPATH%:

D:\cli\env38\Scripts\/src;

This is not a valid path.

@jiasli Jiashuo Li (jiasli) Feb 25, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Also path separator / is not valid on Windows.

@fengzhou-msft Feng Zhou (fengzhou-msft) Feb 25, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I will fix the path separator.

PYTHONPATH is not needed for normal cli run, but let's leave it there for the convenience of using additional custom Python libraries that users do not want to install in the global default location (i.e., the site-packages directory).

@fengzhou-msft Feng Zhou (fengzhou-msft) Feb 25, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Linux counterpart script also has this setting: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/az#L6..L14

@jiasli Jiashuo Li (jiasli) Feb 25, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Not sure if there is a historical reason. As far as I can find, the only possible operation for src to exist is installing via pip install -e <VCS>: pip install -e "git+https://github.com/Azure/azure-sdk-for-python/#egg=azure-mgmt-eventgrid&subdirectory=sdk\eventgrid\azure-mgmt-eventgrid"

Even in that case src should be under %~dp0\... The path to azure-mgmt-eventgrid is added to sys.path via env\Lib\site-packages\azure-mgmt-eventgrid.egg-link.

@fengzhou-msft Feng Zhou (fengzhou-msft) Feb 26, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I agree %~dp0\.. is a better location to put src as %~dp0 is the Scripts directory (or bin directory on Linux). I would consider changing it together with the Linux script when we have more knowledge about the real uses cases and history for this PYTHONPATH setting.

python -m azure.cli %*
)