summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2016-02-25 20:05:43 +0100
committerGiampaolo Rodola <g.rodola@gmail.com>2016-02-25 20:05:43 +0100
commit2cfa3113289147fbd20aa9a53a90ece72b6879c8 (patch)
tree655b8ca25cb0ad965c180b75595e2fd99bb415d3
parent359abafff80441ec9348ae1e342c8a9396897b32 (diff)
parent513607bd58132d844db79a197525747020c87636 (diff)
downloadpsutil-2cfa3113289147fbd20aa9a53a90ece72b6879c8.tar.gz
Merge branch 'master' of github.com:giampaolo/psutil
-rw-r--r--make.bat33
1 files changed, 20 insertions, 13 deletions
diff --git a/make.bat b/make.bat
index 91285d60..f45466a0 100644
--- a/make.bat
+++ b/make.bat
@@ -54,7 +54,8 @@ if "%1" == "help" (
echo clean clean build files
echo flake8 run flake8
echo install compile and install
- echo setup-dev-env install pip, pywin32, wheels, etc. for all python versions
+ echo setup-dev-env install/upgrade pip, pywin32, wheels, etc.
+ echo setup-dev-env-all same as above, for all python versions
echo test run tests
echo test-memleaks run memory leak tests
echo test-process run process related tests
@@ -173,44 +174,50 @@ if "%1" == "upload-all" (
if "%1" == "setup-dev-env" (
:setup-env
+ if not exist get-pip.py (
+ @echo ------------------------------------------------
+ @echo downloading pip installer
+ @echo ------------------------------------------------
+ C:\python27\python.exe -c "import urllib2; r = urllib2.urlopen('https://bootstrap.pypa.io/get-pip.py'); open('get-pip.py', 'wb').write(r.read())"
+ )
@echo ------------------------------------------------
- @echo downloading pip installer
+ @echo installing pip for %PYTHON%
@echo ------------------------------------------------
- C:\python27\python.exe -c "import urllib2; r = urllib2.urlopen('https://raw.github.com/pypa/pip/master/contrib/get-pip.py'); open('get-pip.py', 'wb').write(r.read())"
+ %PYTHON% get-pip.py
@echo ------------------------------------------------
- @echo installing pip
+ @echo upgrade pip for %PYTHON%
@echo ------------------------------------------------
- %PYTHON% get-pip.py
+ %PYTHON% -m pip install pip --upgrade
@echo ------------------------------------------------
@echo installing deps
@echo ------------------------------------------------
rem mandatory / for unittests
%PYTHON% -m pip install unittest2 ipaddress mock wmi wheel pypiwin32 --upgrade
rem nice to have
- %PYTHON% -m pip install ipdb nose --upgrade
+ rem %PYTHON% -m pip install ipdb nose --upgrade
goto :eof
)
if "%1" == "setup-dev-env-all" (
:setup-env
- @echo ------------------------------------------------
- @echo downloading pip installer
- @echo ------------------------------------------------
- C:\python27\python.exe -c "import urllib2; r = urllib2.urlopen('https://raw.github.com/pypa/pip/master/contrib/get-pip.py'); open('get-pip.py', 'wb').write(r.read())"
+ if not exist get-pip.py (
+ @echo ------------------------------------------------
+ @echo downloading pip installer
+ @echo ------------------------------------------------
+ C:\python27\python.exe -c "import urllib2; r = urllib2.urlopen('https://bootstrap.pypa.io/get-pip.py'); open('get-pip.py', 'wb').write(r.read())"
+ )
for %%P in (%ALL_PYTHONS%) do (
@echo ------------------------------------------------
@echo installing pip for %%P
@echo ------------------------------------------------
%%P get-pip.py
- )
- for %%P in (%ALL_PYTHONS%) do (
@echo ------------------------------------------------
@echo installing deps for %%P
@echo ------------------------------------------------
rem mandatory / for unittests
%%P -m pip install unittest2 ipaddress mock wmi wheel pypiwin32 --upgrade
rem nice to have
- %%P -m pip install ipdb nose --upgrade
+ rem %%P -m pip install ipdb nose --upgrade
)
goto :eof
)