X-Git-Url: https://git.phdru.name/?p=sqlconvert.git;a=blobdiff_plain;f=appveyor.yml;h=1a2ca615581677cc2df4f28483df4255733857cf;hp=0113fa5e69e4ebb6a8c6e4827fad848ad52726f7;hb=3566284d6e6b4593906e52b10b78aaf6a07ad8b3;hpb=5dedec6fb8080fb8089e6f2f9274f2fba577cf87

diff --git a/appveyor.yml b/appveyor.yml
index 0113fa5..1a2ca61 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,110 +24,40 @@ environment:
   PGPASSWORD: "Password12!"
 
   matrix:
-    - PYTHON_HOME: "C:\\Python27"
+    - TOXENV: "py27"
       PYTHON_VERSION: "2.7"
       PYTHON_ARCH: "32"
-      TOX_ENV: "py27"
-    - PYTHON_HOME: "C:\\Python27-x64"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "64"
-      TOX_ENV: "py27"
-    - PYTHON_HOME: "C:\\Python34"
-      PYTHON_VERSION: "3.4"
-      PYTHON_ARCH: "32"
-      TOX_ENV: "py34"
-    - PYTHON_HOME: "C:\\Python34-x64"
-      PYTHON_VERSION: "3.4"
-      PYTHON_ARCH: "64"
-      TOX_ENV: "py34"
-    - PYTHON_HOME: "C:\\Python35"
-      PYTHON_VERSION: "3.5"
-      PYTHON_ARCH: "32"
-      TOX_ENV: "py35"
-    - PYTHON_HOME: "C:\\Python35-x64"
-      PYTHON_VERSION: "3.5"
-      PYTHON_ARCH: "64"
-      TOX_ENV: "py35"
-    - PYTHON_HOME: "C:\\Python36"
-      PYTHON_VERSION: "3.6"
-      PYTHON_ARCH: "32"
-      TOX_ENV: "py36"
-    - PYTHON_HOME: "C:\\Python36-x64"
+      PYTHON_HOME: "C:\\Python27"
+    - TOXENV: "py36"
       PYTHON_VERSION: "3.6"
       PYTHON_ARCH: "64"
-      TOX_ENV: "py36"
-    - PYTHON_HOME: "C:\\Python27"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "32"
-      TOX_ENV: "py27-postgres-w32"
-    - PYTHON_HOME: "C:\\Python27-x64"
+      PYTHON_HOME: "C:\\Python36-x64"
+    - TOXENV: "py27-postgres-w32"
       PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "64"
-      TOX_ENV: "py27-postgres-w32"
-    - PYTHON_HOME: "C:\\Python34"
-      PYTHON_VERSION: "3.4"
-      PYTHON_ARCH: "32"
-      TOX_ENV: "py34-postgres-w32"
-    - PYTHON_HOME: "C:\\Python34-x64"
-      PYTHON_VERSION: "3.4"
-      PYTHON_ARCH: "64"
-      TOX_ENV: "py34-postgres-w32"
-    - PYTHON_HOME: "C:\\Python35"
-      PYTHON_VERSION: "3.5"
-      PYTHON_ARCH: "32"
-      TOX_ENV: "py35-postgres-w32"
-    - PYTHON_HOME: "C:\\Python35-x64"
-      PYTHON_VERSION: "3.5"
-      PYTHON_ARCH: "64"
-      TOX_ENV: "py35-postgres-w32"
-    - PYTHON_HOME: "C:\\Python36"
-      PYTHON_VERSION: "3.6"
       PYTHON_ARCH: "32"
-      TOX_ENV: "py36-postgres-w32"
-    - PYTHON_HOME: "C:\\Python36-x64"
+      PYTHON_HOME: "C:\\Python27"
+      db: postgresql
+    - TOXENV: "py36-postgres-w32"
       PYTHON_VERSION: "3.6"
       PYTHON_ARCH: "64"
-      TOX_ENV: "py36-postgres-w32"
-    - PYTHON_HOME: "C:\\Python27"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "32"
-      TOX_ENV: "py27-sqlite-w32"
-    - PYTHON_HOME: "C:\\Python27-x64"
+      PYTHON_HOME: "C:\\Python36-x64"
+      db: postgresql
+    - TOXENV: "py27-sqlite-w32"
       PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "64"
-      TOX_ENV: "py27-sqlite-w32"
-    - PYTHON_HOME: "C:\\Python34"
-      PYTHON_VERSION: "3.4"
-      PYTHON_ARCH: "32"
-      TOX_ENV: "py34-sqlite-w32"
-    - PYTHON_HOME: "C:\\Python34-x64"
-      PYTHON_VERSION: "3.4"
-      PYTHON_ARCH: "64"
-      TOX_ENV: "py34-sqlite-w32"
-    - PYTHON_HOME: "C:\\Python35"
-      PYTHON_VERSION: "3.5"
-      PYTHON_ARCH: "32"
-      TOX_ENV: "py35-sqlite-w32"
-    - PYTHON_HOME: "C:\\Python35-x64"
-      PYTHON_VERSION: "3.5"
-      PYTHON_ARCH: "64"
-      TOX_ENV: "py35-sqlite-w32"
-    - PYTHON_HOME: "C:\\Python36"
-      PYTHON_VERSION: "3.6"
       PYTHON_ARCH: "32"
-      TOX_ENV: "py36-sqlite-w32"
-    - PYTHON_HOME: "C:\\Python36-x64"
+      PYTHON_HOME: "C:\\Python27"
+    - TOXENV: "py36-sqlite-w32"
       PYTHON_VERSION: "3.6"
       PYTHON_ARCH: "64"
-      TOX_ENV: "py36-sqlite-w32"
-    - PYTHON_HOME: "C:\\Python27"
+      PYTHON_HOME: "C:\\Python36-x64"
+    - TOXENV: "py27-flake8"
       PYTHON_VERSION: "2.7"
       PYTHON_ARCH: "32"
-      TOX_ENV: "py27-flake8"
-    - PYTHON_HOME: "C:\\Python34-x64"
+      PYTHON_HOME: "C:\\Python27"
+    - TOXENV: "py34-flake8"
       PYTHON_VERSION: "3.4"
       PYTHON_ARCH: "64"
-      TOX_ENV: "py34-flake8"
+      PYTHON_HOME: "C:\\Python34-x64"
 
 install:
   # Ensure we use the right python version
@@ -135,14 +65,15 @@ install:
   - "SET TOXPYTHON=%PYTHON_HOME%\\python.exe"
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
+  - "python -m pip install --upgrade pip setuptools"
+  - "pip install --upgrade tox ppu"
   - "pip --version"
-  - "pip install tox ppu"
 
 # No build step - we don't have C extensions
 build: false
 
 test_script:
-  - "tox -e %TOX_ENV%"
+  - "tox"
 
 after_test:
   - "remove-old-files.py -o 180 %LOCALAPPDATA%\\pip\\Cache"