-
Notifications
You must be signed in to change notification settings - Fork 115
Update Python version on Windows #1382
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
Merged
Merged
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
b8f582c
Update Python version on Windows
mthalman 5195bd6
Refactor to use PowerShell
mthalman 8425012
Merge branch 'main' into windows-python
mthalman c15a3f5
Use pip from virtual environment
mthalman 884c212
Set virt env scripts dir on PATH
mthalman 13e7a15
Reorder paths
mthalman acf45ac
Merge branch 'main' into windows-python
mthalman File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,69 @@ | ||
| # escape=` | ||
| FROM mcr.microsoft.com/windows/servercore:ltsc2019 | ||
|
|
||
| SHELL ["cmd", "/S", "/C"] | ||
| USER ContainerAdministrator | ||
dougbu marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| RUN setx /M PATH "%PATH%;C:\Python;C:\python\scripts" && ` | ||
| setx /M PYTHONPATH "C:\Python\Lib;C:\Python\DLLs;" && ` | ||
| setx /M VIRTUAL_ENV "C:\Python-env" | ||
|
|
||
| RUN curl -SL --output %TEMP%\python.zip https://www.nuget.org/api/v2/package/python/3.7.3 ` | ||
| && md C:\Python C:\PythonTemp ` | ||
| && tar -zxf %TEMP%\python.zip -C C:\PythonTemp ` | ||
| && xcopy /s c:\PythonTemp\tools C:\Python ` | ||
| && rd /s /q c:\PythonTemp ` | ||
| && del /q %TEMP%\python.zip ` | ||
| && setx /M PYTHONPATH "C:\Python\Lib;C:\Python\DLLs;" | ||
| # Install latest stable version of Python | ||
| RUN powershell -Command " ` | ||
| $apiUrl = 'https://api.nuget.org/v3-flatcontainer/python/index.json'; ` | ||
| $response = Invoke-RestMethod -Uri $apiUrl; ` | ||
| $versions = $response.versions | Where-Object { $_ -notmatch '-' } | Sort-Object { [version]$_ } -Descending; ` | ||
| $latestVersion = $versions[0]; ` | ||
| echo \"Downloading Python $latestVersion\"; ` | ||
| $pythonZip = \"$env:TEMP\python.zip\"; ` | ||
| Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/python/$latestVersion -OutFile $pythonZip; ` | ||
| $pythonTemp = 'C:\PythonTemp'; ` | ||
| md $pythonTemp; ` | ||
| tar -zxf $pythonZip -C $pythonTemp; ` | ||
| if ($LASTEXITCODE -ne 0) { ` | ||
| echo 'Failed to extract Python'; ` | ||
| exit 1; ` | ||
| } ` | ||
| xcopy /s /i c:\PythonTemp\tools C:\Python; ` | ||
| if ($LASTEXITCODE -ne 0) { ` | ||
| echo 'Failed to copy Python'; ` | ||
| exit 1; ` | ||
| } ` | ||
| Remove-Item -Recurse -Force $pythonTemp; ` | ||
| Remove-Item -Force $pythonZip;" | ||
|
|
||
| RUN md c:\\helixtmp && pushd c:\\helixtmp &&` | ||
| C:\Python\python.exe -m pip install --upgrade pip==20.2 --no-warn-script-location && ` | ||
| C:\Python\python.exe -m pip install virtualenv==16.6.0 --no-warn-script-location && ` | ||
| C:\Python\python.exe -m pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple && ` | ||
| for %f in (.\helix_scripts-*-py3-none-any.whl) do (C:\Python\python.exe -m pip install %f --no-warn-script-location) && ` | ||
| popd && rd /s /q c:\\helixtmp && ` | ||
| powershell -Command ` | ||
| New-Item -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\' -Name 'dotnet.exe' -Force -ErrorAction SilentlyContinue ; ` | ||
| Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\dotnet.exe' -Value 2 -Name DumpType -Force ; ` | ||
| Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\dotnet.exe' -Value 'C:\cores' -Name DumpFolder -Force ; ` | ||
| Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\dotnet.exe' -Value 2 -Name DumpCount -Force ; ` | ||
| New-Item -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\' -Name 'corerun.exe' -Force -ErrorAction SilentlyContinue ; ` | ||
| Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\corerun.exe' -Value 2 -Name DumpType -Force ; ` | ||
| Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\corerun.exe' -Value 'C:\cores' -Name DumpFolder -Force ; ` | ||
| Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\corerun.exe' -Value 2 -Name DumpCount -Force && ` | ||
| setx /M PATH "%PATH%;C:\Python;C:\python\scripts" | ||
| # Install Helix | ||
| RUN powershell -Command " ` | ||
| $helixTemp = 'C:\helixtmp'; ` | ||
| md $helixTemp; ` | ||
| pushd $helixTemp; ` | ||
| python -m venv $env:VIRTUAL_ENV; ` | ||
| if ($LASTEXITCODE -ne 0) { ` | ||
| echo \"Failed to create Python virtual environment\"; ` | ||
| exit 1; ` | ||
| } ` | ||
| & $env:VIRTUAL_ENV\Scripts\pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple; ` | ||
| if ($LASTEXITCODE -ne 0) { ` | ||
| echo \"Failed to download Helix scripts\"; ` | ||
| exit 1; ` | ||
| } ` | ||
| Get-ChildItem -Path $helixTemp -Filter 'helix_scripts-*-py3-none-any.whl' | ` | ||
| ForEach-Object { ` | ||
| & $env:VIRTUAL_ENV\Scripts\pip install $_.FullName --no-cache-dir; ` | ||
| if ($LASTEXITCODE -ne 0) { ` | ||
| echo \"Failed to install Helix script: $($_.Name)\"; ` | ||
| exit 1; ` | ||
| } ` | ||
| }; ` | ||
| popd; ` | ||
| Remove-Item -Recurse -Force $helixTemp;" | ||
|
|
||
| WORKDIR C:\\Work | ||
| # Configure crash dumps for dotnet.exe and corerun.exe | ||
| RUN powershell -Command " ` | ||
| New-Item -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\' -Name 'dotnet.exe' -Force -ErrorAction SilentlyContinue; ` | ||
| Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\dotnet.exe' -Value 2 -Name DumpType -Force; ` | ||
| Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\dotnet.exe' -Value 'C:\cores' -Name DumpFolder -Force; ` | ||
| Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\dotnet.exe' -Value 2 -Name DumpCount -Force; ` | ||
| New-Item -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\' -Name 'corerun.exe' -Force -ErrorAction SilentlyContinue; ` | ||
| Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\corerun.exe' -Value 2 -Name DumpType -Force; ` | ||
| Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\corerun.exe' -Value 'C:\cores' -Name DumpFolder -Force; ` | ||
| Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\corerun.exe' -Value 2 -Name DumpCount -Force" | ||
|
|
||
| WORKDIR C:\\Work | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,69 @@ | ||
| # escape=` | ||
| FROM mcr.microsoft.com/windows/servercore:ltsc2022 | ||
|
|
||
| SHELL ["cmd", "/S", "/C"] | ||
| USER ContainerAdministrator | ||
| RUN setx /M PATH "%PATH%;C:\Python;C:\python\scripts" && ` | ||
| setx /M PYTHONPATH "C:\Python\Lib;C:\Python\DLLs;" && ` | ||
| setx /M VIRTUAL_ENV "C:\Python-env" | ||
|
|
||
| RUN curl -SL --output %TEMP%\python.zip https://www.nuget.org/api/v2/package/python/3.7.3 ` | ||
| && md C:\Python C:\PythonTemp ` | ||
| && tar -zxf %TEMP%\python.zip -C C:\PythonTemp ` | ||
| && xcopy /s c:\PythonTemp\tools C:\Python ` | ||
| && rd /s /q c:\PythonTemp ` | ||
| && del /q %TEMP%\python.zip ` | ||
| && setx /M PYTHONPATH "C:\Python\Lib;C:\Python\DLLs;" | ||
| # Install latest stable version of Python | ||
| RUN powershell -Command " ` | ||
| $apiUrl = 'https://api.nuget.org/v3-flatcontainer/python/index.json'; ` | ||
| $response = Invoke-RestMethod -Uri $apiUrl; ` | ||
| $versions = $response.versions | Where-Object { $_ -notmatch '-' } | Sort-Object { [version]$_ } -Descending; ` | ||
| $latestVersion = $versions[0]; ` | ||
| echo \"Downloading Python $latestVersion\"; ` | ||
| $pythonZip = \"$env:TEMP\python.zip\"; ` | ||
| Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/python/$latestVersion -OutFile $pythonZip; ` | ||
| $pythonTemp = 'C:\PythonTemp'; ` | ||
| md $pythonTemp; ` | ||
| tar -zxf $pythonZip -C $pythonTemp; ` | ||
| if ($LASTEXITCODE -ne 0) { ` | ||
| echo 'Failed to extract Python'; ` | ||
| exit 1; ` | ||
| } ` | ||
| xcopy /s /i c:\PythonTemp\tools C:\Python; ` | ||
| if ($LASTEXITCODE -ne 0) { ` | ||
| echo 'Failed to copy Python'; ` | ||
| exit 1; ` | ||
| } ` | ||
| Remove-Item -Recurse -Force $pythonTemp; ` | ||
| Remove-Item -Force $pythonZip;" | ||
|
|
||
| RUN md c:\\helixtmp && pushd c:\\helixtmp &&` | ||
| C:\Python\python.exe -m pip install --upgrade pip==20.2 --no-warn-script-location && ` | ||
| C:\Python\python.exe -m pip install virtualenv==16.6.0 --no-warn-script-location && ` | ||
| C:\Python\python.exe -m pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple && ` | ||
| for %f in (.\helix_scripts-*-py3-none-any.whl) do (C:\Python\python.exe -m pip install %f --no-warn-script-location) && ` | ||
| popd && rd /s /q c:\\helixtmp && ` | ||
| powershell -Command ` | ||
| New-Item -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\' -Name 'dotnet.exe' -Force -ErrorAction SilentlyContinue ; ` | ||
| Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\dotnet.exe' -Value 2 -Name DumpType -Force ; ` | ||
| Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\dotnet.exe' -Value 'C:\cores' -Name DumpFolder -Force ; ` | ||
| Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\dotnet.exe' -Value 2 -Name DumpCount -Force ; ` | ||
| New-Item -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\' -Name 'corerun.exe' -Force -ErrorAction SilentlyContinue ; ` | ||
| Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\corerun.exe' -Value 2 -Name DumpType -Force ; ` | ||
| Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\corerun.exe' -Value 'C:\cores' -Name DumpFolder -Force ; ` | ||
| Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\corerun.exe' -Value 2 -Name DumpCount -Force && ` | ||
| setx /M PATH "%PATH%;C:\Python;C:\python\scripts" | ||
| # Install Helix | ||
| RUN powershell -Command " ` | ||
| $helixTemp = 'C:\helixtmp'; ` | ||
| md $helixTemp; ` | ||
| pushd $helixTemp; ` | ||
| python -m venv $env:VIRTUAL_ENV; ` | ||
| if ($LASTEXITCODE -ne 0) { ` | ||
| echo \"Failed to create Python virtual environment\"; ` | ||
| exit 1; ` | ||
| } ` | ||
| & $env:VIRTUAL_ENV\Scripts\pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple; ` | ||
| if ($LASTEXITCODE -ne 0) { ` | ||
| echo \"Failed to download Helix scripts\"; ` | ||
| exit 1; ` | ||
| } ` | ||
| Get-ChildItem -Path $helixTemp -Filter 'helix_scripts-*-py3-none-any.whl' | ` | ||
| ForEach-Object { ` | ||
| & $env:VIRTUAL_ENV\Scripts\pip install $_.FullName --no-cache-dir; ` | ||
| if ($LASTEXITCODE -ne 0) { ` | ||
| echo \"Failed to install Helix script: $($_.Name)\"; ` | ||
| exit 1; ` | ||
| } ` | ||
| }; ` | ||
| popd; ` | ||
| Remove-Item -Recurse -Force $helixTemp;" | ||
|
|
||
| # Configure crash dumps for dotnet.exe and corerun.exe | ||
| RUN powershell -Command " ` | ||
| New-Item -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\' -Name 'dotnet.exe' -Force -ErrorAction SilentlyContinue; ` | ||
| Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\dotnet.exe' -Value 2 -Name DumpType -Force; ` | ||
| Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\dotnet.exe' -Value 'C:\cores' -Name DumpFolder -Force; ` | ||
| Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\dotnet.exe' -Value 2 -Name DumpCount -Force; ` | ||
| New-Item -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\' -Name 'corerun.exe' -Force -ErrorAction SilentlyContinue; ` | ||
| Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\corerun.exe' -Value 2 -Name DumpType -Force; ` | ||
| Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\corerun.exe' -Value 'C:\cores' -Name DumpFolder -Force; ` | ||
| Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\corerun.exe' -Value 2 -Name DumpCount -Force" | ||
|
|
||
| WORKDIR C:\\Work |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
shouldn't break anything (I hope) but suggest defining
%VIRTUAL_ENV%first then including%VIRTUAL_ENV%\\Scriptsin%PATH%