X-Git-Url: https://git.phdru.name/?p=sqlconvert.git;a=blobdiff_plain;f=appveyor.yml;h=9d556da2c9ee45217837ebdc061e3cf1b4b50ae2;hp=47a926e24760e6f40b29dddcf4165ef00420654c;hb=af1464f12b7b11c6bc8ccdbcd787e2081c419c08;hpb=c1713c535d17256b2be47b118794fd9ad7c93c39

diff --git a/appveyor.yml b/appveyor.yml
index 47a926e..9d556da 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,107 +24,37 @@ environment:
   PGPASSWORD: "Password12!"
 
   matrix:
-    - TOX_ENV: "py27"
+    - TOXENV: "py27"
       PYTHON_VERSION: "2.7"
       PYTHON_ARCH: "32"
       PYTHON_HOME: "C:\\Python27"
-    - TOX_ENV: "py27"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "64"
-      PYTHON_HOME: "C:\\Python27-x64"
-    - TOX_ENV: "py34"
-      PYTHON_VERSION: "3.4"
-      PYTHON_ARCH: "32"
-      PYTHON_HOME: "C:\\Python34"
-    - TOX_ENV: "py34"
-      PYTHON_VERSION: "3.4"
-      PYTHON_ARCH: "64"
-      PYTHON_HOME: "C:\\Python34-x64"
-    - TOX_ENV: "py35"
-      PYTHON_VERSION: "3.5"
-      PYTHON_ARCH: "32"
-      PYTHON_HOME: "C:\\Python35"
-    - TOX_ENV: "py35"
-      PYTHON_VERSION: "3.5"
-      PYTHON_ARCH: "64"
-      PYTHON_HOME: "C:\\Python35-x64"
-    - TOX_ENV: "py36"
-      PYTHON_VERSION: "3.6"
-      PYTHON_ARCH: "32"
-      PYTHON_HOME: "C:\\Python36"
-    - TOX_ENV: "py36"
+    - TOXENV: "py36"
       PYTHON_VERSION: "3.6"
       PYTHON_ARCH: "64"
       PYTHON_HOME: "C:\\Python36-x64"
-    - TOX_ENV: "py27-postgres-w32"
+    - TOXENV: "py27-postgres-w32"
       PYTHON_VERSION: "2.7"
       PYTHON_ARCH: "32"
       PYTHON_HOME: "C:\\Python27"
-    - TOX_ENV: "py27-postgres-w32"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "64"
-      PYTHON_HOME: "C:\\Python27-x64"
-    - TOX_ENV: "py34-postgres-w32"
-      PYTHON_VERSION: "3.4"
-      PYTHON_ARCH: "32"
-      PYTHON_HOME: "C:\\Python34"
-    - TOX_ENV: "py34-postgres-w32"
-      PYTHON_VERSION: "3.4"
-      PYTHON_ARCH: "64"
-      PYTHON_HOME: "C:\\Python34-x64"
-    - TOX_ENV: "py35-postgres-w32"
-      PYTHON_VERSION: "3.5"
-      PYTHON_ARCH: "32"
-      PYTHON_HOME: "C:\\Python35"
-    - TOX_ENV: "py35-postgres-w32"
-      PYTHON_VERSION: "3.5"
-      PYTHON_ARCH: "64"
-      PYTHON_HOME: "C:\\Python35-x64"
-    - TOX_ENV: "py36-postgres-w32"
-      PYTHON_VERSION: "3.6"
-      PYTHON_ARCH: "32"
-      PYTHON_HOME: "C:\\Python36"
-    - TOX_ENV: "py36-postgres-w32"
+      db: postgresql
+    - TOXENV: "py36-postgres-w32"
       PYTHON_VERSION: "3.6"
       PYTHON_ARCH: "64"
       PYTHON_HOME: "C:\\Python36-x64"
-    - TOX_ENV: "py27-sqlite-w32"
+      db: postgresql
+    - TOXENV: "py27-sqlite-w32"
       PYTHON_VERSION: "2.7"
       PYTHON_ARCH: "32"
       PYTHON_HOME: "C:\\Python27"
-    - TOX_ENV: "py27-sqlite-w32"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "64"
-      PYTHON_HOME: "C:\\Python27-x64"
-    - TOX_ENV: "py34-sqlite-w32"
-      PYTHON_VERSION: "3.4"
-      PYTHON_ARCH: "32"
-      PYTHON_HOME: "C:\\Python34"
-    - TOX_ENV: "py34-sqlite-w32"
-      PYTHON_VERSION: "3.4"
-      PYTHON_ARCH: "64"
-      PYTHON_HOME: "C:\\Python34-x64"
-    - TOX_ENV: "py35-sqlite-w32"
-      PYTHON_VERSION: "3.5"
-      PYTHON_ARCH: "32"
-      PYTHON_HOME: "C:\\Python35"
-    - TOX_ENV: "py35-sqlite-w32"
-      PYTHON_VERSION: "3.5"
-      PYTHON_ARCH: "64"
-      PYTHON_HOME: "C:\\Python35-x64"
-    - TOX_ENV: "py36-sqlite-w32"
-      PYTHON_VERSION: "3.6"
-      PYTHON_ARCH: "32"
-      PYTHON_HOME: "C:\\Python36"
-    - TOX_ENV: "py36-sqlite-w32"
+    - TOXENV: "py36-sqlite-w32"
       PYTHON_VERSION: "3.6"
       PYTHON_ARCH: "64"
       PYTHON_HOME: "C:\\Python36-x64"
-    - TOX_ENV: "py27-flake8"
+    - TOXENV: "py27-flake8"
       PYTHON_VERSION: "2.7"
       PYTHON_ARCH: "32"
       PYTHON_HOME: "C:\\Python27"
-    - TOX_ENV: "py34-flake8"
+    - TOXENV: "py34-flake8"
       PYTHON_VERSION: "3.4"
       PYTHON_ARCH: "64"
       PYTHON_HOME: "C:\\Python34-x64"
@@ -136,13 +66,13 @@ install:
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
   - "pip --version"
-  - "pip install tox ppu"
+  - "pip install --upgrade pip setuptools 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"