Merge pull request #162 from tonyroberts/develop

tonyroberts · tonyroberts · commit c2ca646d0c83 · 2016-02-23T22:30:24.000Z
Update appveyor to use pre-installed Python.
diff --git a/appveyor.yml b/appveyor.yml
@@ -4,31 +4,26 @@ environment:
   global:
     PYTHONPATH: c:\testdir
     PYTHONWARNINGS: 'ignore:::pip.pep425tags:'
-    PIPURL: https://bootstrap.pypa.io/get-pip.py
 
   matrix:
-  - pythonurl: http://www.python.org/ftp/python/2.7.6/python-2.7.6.amd64.msi
-  - pythonurl: http://www.python.org/ftp/python/2.7.6/python-2.7.6.msi
-  - pythonurl: http://www.python.org/ftp/python/3.3.5/python-3.3.5.msi
-  - pythonurl: http://www.python.org/ftp/python/3.3.5/python-3.3.5.amd64.msi 
-  - pythonurl: http://www.python.org/ftp/python/3.4.2/python-3.4.2.msi
-  - pythonurl: http://www.python.org/ftp/python/3.4.2/python-3.4.2.amd64.msi 
+    # http://www.appveyor.com/docs/installed-software#python
+    - PYTHON: "C:\\Python27"
+    - PYTHON: "C:\\Python27-x64"
+    - PYTHON: "C:\\Python33"
+    - PYTHON: "C:\\Python33-x64"
+    - PYTHON: "C:\\Python34"
+    - PYTHON: "C:\\Python34-x64"
 
 install:
-  - ps: (new-object net.webclient).DownloadFile($env:pythonurl, 'C:\python.msi')
-  - ps: start-process -wait -FilePath msiexec.exe -ArgumentList '/qn /x C:\python.msi TARGETDIR=C:\Python'
-  - ps: start-process -wait -FilePath msiexec.exe -ArgumentList '/qn /i C:\python.msi TARGETDIR=C:\Python'
-  - ps: (new-object net.webclient).DownloadFile($env:PIPURL, 'C:\get-pip.py')
-  - C:\Python\python.exe --version
-  - C:\Python\python.exe c:\get-pip.py
-  - C:\Python\Scripts\pip.exe install wheel
-  - C:\Python\Scripts\pip.exe install six
+- "%PYTHON%\\python.exe -m pip install --upgrade pip"
+- "%PYTHON%\\python.exe -m pip install wheel"
+- "%PYTHON%\\python.exe -m pip install six"
 
 build_script:
-  - C:\python\python.exe setup.py bdist_wheel
+- "%PYTHON%\\python.exe setup.py bdist_wheel"
 
 test_script:
-  - ps: C:\Python\Scripts\pip.exe install --no-cache-dir --force-reinstall --ignore-installed ('dist\' + (gci dist)[0].Name)
+  - ps: '& "$env:PYTHON\\Scripts\\pip.exe" install --no-cache-dir --force-reinstall --ignore-installed ("dist\\" + (gci dist)[0].Name)'
   - mkdir c:\testdir
   - ps: copy-item (gci -path build -re -include Python.Test.dll)[0].FullName c:\testdir
-  - c:\python\python.exe src\tests\runtests.py
+  - "%PYTHON%\\python.exe src\\tests\\runtests.py"
