update make.bat

1 files changed, 6 insertions, 4 deletions

diff --git a/make.bat b/make.bat
index 91285d60..8fd0034f 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
@@ -176,7 +177,7 @@ if "%1" == "setup-dev-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())"
+    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 installing pip
     @echo ------------------------------------------------
@@ -196,12 +197,13 @@ if "%1" == "setup-dev-env-all" (
     @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())"
+    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
+        %%P -m pip install pip --upgrade
     )
     for %%P in (%ALL_PYTHONS%) do (
         @echo ------------------------------------------------
@@ -210,7 +212,7 @@ if "%1" == "setup-dev-env-all" (
         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
 )