X-Git-Url: https://git.phdru.name/?p=sqlconvert.git;a=blobdiff_plain;f=appveyor.yml;h=cecbe1f38446a4f331cfb580d70ececd824a9864;hp=80ba5e1fb3ce83998fad10b7fad105c54c17a6cb;hb=700d5c77d95d1f0aa0660a634e5d15aae370b94c;hpb=f5bc1166430a10995e541ab263cb22634c7d9da4

diff --git a/appveyor.yml b/appveyor.yml
index 80ba5e1..cecbe1f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,92 +16,64 @@ cache:
 # Match travis
 clone_depth: 50
 
+services:
+  - postgresql
+
 environment:
+  PGUSER: "postgres"
+  PGPASSWORD: "Password12!"
+
   matrix:
-    - PYTHON_HOME: "C:\\Python27"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "32"
-      TOX_ENV: "py27"
-    - PYTHON_HOME: "C:\\Python27-x64"
+    - TOXENV: "py27"
       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_VERSION: "3.6"
+      PYTHON_HOME: "C:\\Python27"
+    - TOXENV: "py37"
+      PYTHON_VERSION: "3.7"
       PYTHON_ARCH: "64"
-      TOX_ENV: "py36"
-    - PYTHON_HOME: "C:\\Python27"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "32"
-      TOX_ENV: "py27-sqlite-w32"
-    - PYTHON_HOME: "C:\\Python27-x64"
+      PYTHON_HOME: "C:\\Python37-x64"
+    - TOXENV: "py27-postgres-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_HOME: "C:\\Python27"
+      db: postgresql
+    - TOXENV: "py37-postgres-w32"
+      PYTHON_VERSION: "3.7"
       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_HOME: "C:\\Python37-x64"
+      db: postgresql
+    - TOXENV: "py27-sqlite-w32"
+      PYTHON_VERSION: "2.7"
       PYTHON_ARCH: "32"
-      TOX_ENV: "py36-sqlite-w32"
-    - PYTHON_HOME: "C:\\Python36-x64"
-      PYTHON_VERSION: "3.6"
+      PYTHON_HOME: "C:\\Python27"
+    - TOXENV: "py37-sqlite-w32"
+      PYTHON_VERSION: "3.7"
       PYTHON_ARCH: "64"
-      TOX_ENV: "py36-sqlite-w32"
-    - PYTHON_HOME: "C:\\Python27"
+      PYTHON_HOME: "C:\\Python37-x64"
+    - TOXENV: "py27-flake8"
       PYTHON_VERSION: "2.7"
       PYTHON_ARCH: "32"
-      TOX_ENV: "py27-flake8"
-    - PYTHON_HOME: "C:\\Python34-x64"
-      PYTHON_VERSION: "3.4"
+      PYTHON_HOME: "C:\\Python27"
+    - TOXENV: "py37-flake8"
+      PYTHON_VERSION: "3.7"
       PYTHON_ARCH: "64"
-      TOX_ENV: "py34-flake8"
+      PYTHON_HOME: "C:\\Python37-x64"
 
 install:
   # Ensure we use the right python version
-  - "SET PATH=%PYTHON_HOME%;%PYTHON_HOME%\\Scripts;%PATH%"
+  - "SET PATH=%PYTHON_HOME%;%PYTHON_HOME%\\Scripts;C:\\Program Files\\PostgreSQL\\9.5\\bin;%PATH%"
   - "SET TOXPYTHON=%PYTHON_HOME%\\python.exe"
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
+  - "python -m pip install --upgrade \"pip < 19.1\" setuptools"
+  - "pip install --upgrade \"tox < 3.1\" ppu"
   - "pip --version"
-  - "pip install tox"
 
 # 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"