diff options
| author | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2018-02-26 09:18:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-05-02 19:01:40 +0000 |
| commit | c7562fa8ef8f0d01709527238f4c53669e1e53ff (patch) | |
| tree | 80fcddba6f269b7e99d063f35514185d0502f0c4 /coin/provisioning/common/windows/python.ps1 | |
| parent | f5af9f119b2c97469ab3621f0c2ee7498920f5c4 (diff) | |
Take proxy into use in python provisioning in windows
Task-number: QTQAINFRA-1669
Change-Id: I2030f244da65e4fd0c3b0be54d941b065f9a180e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Diffstat (limited to 'coin/provisioning/common/windows/python.ps1')
| -rw-r--r-- | coin/provisioning/common/windows/python.ps1 | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/coin/provisioning/common/windows/python.ps1 b/coin/provisioning/common/windows/python.ps1 index 28881d58..05811c58 100644 --- a/coin/provisioning/common/windows/python.ps1 +++ b/coin/provisioning/common/windows/python.ps1 @@ -64,10 +64,11 @@ Add-Path "C:\Python27;C:\Python27\Scripts" Run-Executable "C:\Python27\python.exe" "-m ensurepip" # Install python virtual env -#if (isProxyEnabled) { -# Write-Host "Using proxy with pip" -# $pip_args = "--proxy=" + (getProxy) -#} -Run-Executable "C:\Python27\Scripts\pip.exe" "install virtualenv" +if (IsProxyEnabled) { + $proxy = Get-Proxy + Write-Host "Using proxy ($proxy) with pip" + $pip_args = "--proxy=$proxy" +} +Run-Executable "C:\Python27\Scripts\pip.exe" "$pip_args install virtualenv" Write-Output "Python = $version" >> ~/versions.txt |