diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2018-04-12 10:30:37 +0200 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2018-04-12 10:30:37 +0200 |
commit | 8a5ad9adaa758598156d1a0c701969dfd3814d36 (patch) | |
tree | 45f8ca7b2b1ec6548c69f0ab28a4e447b3acdf16 | |
parent | 540c71af92bb3ca60a2da63e4392f941087962ba (diff) | |
download | psutil-8a5ad9adaa758598156d1a0c701969dfd3814d36.tar.gz |
and another one
-rw-r--r-- | appveyor.yml | 2 | ||||
-rwxr-xr-x | scripts/internal/winmake.py | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/appveyor.yml b/appveyor.yml index 8b73375e..f39053ad 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -75,7 +75,7 @@ install: - "%WITH_COMPILER% %PYTHON%/python.exe setup.py build" - "%WITH_COMPILER% %PYTHON%/python.exe setup.py build build_ext -i" - "%WITH_COMPILER% %PYTHON%/python.exe setup.py develop" - - "%WITH_COMPILER% %PYTHON%/python.exe -m pip install --upgrade --user unittest2 ipaddress pypiwin32 wmi wheel" + - "%WITH_COMPILER% %PYTHON%/python.exe scripts/internal/winmake.py setup-dev-env" build: off diff --git a/scripts/internal/winmake.py b/scripts/internal/winmake.py index f12a40cf..bd518f09 100755 --- a/scripts/internal/winmake.py +++ b/scripts/internal/winmake.py @@ -24,7 +24,11 @@ import sys import tempfile -PYTHON = os.getenv('PYTHON', sys.executable) +APPVEYOR = bool(os.environ.get('APPVEYOR')) +if APPVEYOR: + PYTHON = sys.executable +else: + PYTHON = os.getenv('PYTHON', sys.executable) TSCRIPT = os.getenv('TSCRIPT', 'psutil\\tests\\__main__.py') GET_PIP_URL = "https://bootstrap.pypa.io/get-pip.py" PY3 = sys.version_info[0] == 3 |