diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2018-04-12 07:50:46 +0200 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2018-04-12 07:50:46 +0200 |
| commit | fa54c8ae4a384394efe867681a2c5d40a0d50de0 (patch) | |
| tree | c0eb74c9fa13189520fde6994fe024079ed1d2d8 | |
| parent | cb43f64ec4a81b1ffabc7c20f67f71b8d6c58e98 (diff) | |
| download | psutil-fa54c8ae4a384394efe867681a2c5d40a0d50de0.tar.gz | |
adjust win deps
| -rw-r--r-- | appveyor.yml | 5 | ||||
| -rwxr-xr-x | scripts/internal/winmake.py | 12 |
2 files changed, 9 insertions, 8 deletions
diff --git a/appveyor.yml b/appveyor.yml index 1bacc065..a0ca6a0e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -71,14 +71,11 @@ install: # - ps: (new-object net.webclient).DownloadFile('https://raw.github.com/pypa/pip/master/contrib/get-pip.py', 'C:/get-pip.py') - "%WITH_COMPILER% %PYTHON%/python.exe -m pip --version" - "%WITH_COMPILER% %PYTHON%/python.exe -m pip install --upgrade --user setuptools pip" - - "%WITH_COMPILER% %PYTHON%/python.exe -m pip install --upgrade --user unittest2 ipaddress pypiwin32==219 wmi wheel" + - "%WITH_COMPILER% %PYTHON%/python.exe scripts/internal/winmake.py setup-dev-env" - "%WITH_COMPILER% %PYTHON%/python.exe -m pip freeze" - - "%WITH_COMPILER% %PYTHON%/python.exe scripts/internal/winmake.py clean" - "%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" - # 1.0.1 is the latest release supporting python 2.6 - - "%WITH_COMPILER% %PYTHON%/Scripts/pip.exe install mock==1.0.1" build: off diff --git a/scripts/internal/winmake.py b/scripts/internal/winmake.py index 57543750..f12a40cf 100755 --- a/scripts/internal/winmake.py +++ b/scripts/internal/winmake.py @@ -33,20 +33,24 @@ ROOT_DIR = os.path.realpath(os.path.join(HERE, "..", "..")) DEPS = [ "coverage", "flake8", - "ipaddress", - "mock", "nose", "pdbpp", "perf", "pip", - "pypiwin32", + "pypiwin32==219" if sys.version_info[:2] <= (3, 4) else "pypiwin32", "pyreadline", "setuptools", - "unittest2", "wheel", "wmi", "requests" ] +if sys.version_info[:2] <= (2, 6): + DEPS.append('unittest2') +if sys.version_info[:2] <= (2, 7): + DEPS.append('mock') +if sys.version_info[:2] <= (3, 2): + DEPS.append('ipaddress') + _cmds = {} if PY3: basestring = str |