X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=appveyor.yml;h=420ed1d85d1d89e2fc9bd836aaba517d7f241d0d;hb=6af904215c40152c1f345e1a2fdb28b9d33d0cf9;hp=0d43255debd435d9a0ea4d7be42bb8c0ab04692e;hpb=76a936bb47ae37312e5377e4229da1acdeb9f5f5;p=sqlconvert.git

diff --git a/appveyor.yml b/appveyor.yml
index 0d43255..420ed1d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,14 +2,6 @@
 # Heavily inspired by Oliver Grisel's appveyor-demo (https://github.com/ogrisel/python-appveyor-demo)
 version: '{branch}-{build}'
 
-# Only test master and pull requests; skip tags.
-# Other branches can allow themselves.
-branches:
-  only:
-    - master
-skip_branch_with_pr: false
-skip_tags: true
-
 cache:
   - '%LOCALAPPDATA%\pip\Cache'
 
@@ -28,114 +20,81 @@ environment:
       PYTHON_VERSION: "2.7"
       PYTHON_ARCH: "32"
       PYTHON_HOME: "C:\\Python27"
-    - TOXENV: "py27"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "64"
-      PYTHON_HOME: "C:\\Python27-x64"
-    - TOXENV: "py34"
-      PYTHON_VERSION: "3.4"
-      PYTHON_ARCH: "32"
-      PYTHON_HOME: "C:\\Python34"
-    - TOXENV: "py34"
-      PYTHON_VERSION: "3.4"
+    - TOXENV: "py37"
+      PYTHON_VERSION: "3.7"
       PYTHON_ARCH: "64"
-      PYTHON_HOME: "C:\\Python34-x64"
-    - TOXENV: "py35"
-      PYTHON_VERSION: "3.5"
-      PYTHON_ARCH: "32"
-      PYTHON_HOME: "C:\\Python35"
-    - TOXENV: "py35"
-      PYTHON_VERSION: "3.5"
+      PYTHON_HOME: "C:\\Python37-x64"
+    - TOXENV: "py38"
+      PYTHON_VERSION: "3.8"
       PYTHON_ARCH: "64"
-      PYTHON_HOME: "C:\\Python35-x64"
-    - TOXENV: "py36"
-      PYTHON_VERSION: "3.6"
+      PYTHON_HOME: "C:\\Python38-x64"
+    - TOXENV: "py39"
+      PYTHON_VERSION: "3.9"
       PYTHON_ARCH: "32"
-      PYTHON_HOME: "C:\\Python36"
-    - TOXENV: "py36"
-      PYTHON_VERSION: "3.6"
+      PYTHON_HOME: "C:\\Python39"
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+    - TOXENV: "py39"
+      PYTHON_VERSION: "3.9"
       PYTHON_ARCH: "64"
-      PYTHON_HOME: "C:\\Python36-x64"
+      PYTHON_HOME: "C:\\Python39-x64"
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
     - TOXENV: "py27-postgres-w32"
       PYTHON_VERSION: "2.7"
       PYTHON_ARCH: "32"
       PYTHON_HOME: "C:\\Python27"
       db: postgresql
-    - TOXENV: "py27-postgres-w32"
-      PYTHON_VERSION: "2.7"
+    - TOXENV: "py37-postgres-w32"
+      PYTHON_VERSION: "3.7"
       PYTHON_ARCH: "64"
-      PYTHON_HOME: "C:\\Python27-x64"
-      db: postgresql
-    - TOXENV: "py34-postgres-w32"
-      PYTHON_VERSION: "3.4"
-      PYTHON_ARCH: "32"
-      PYTHON_HOME: "C:\\Python34"
+      PYTHON_HOME: "C:\\Python37-x64"
       db: postgresql
-    - TOXENV: "py34-postgres-w32"
-      PYTHON_VERSION: "3.4"
+    - TOXENV: "py38-postgres-w32"
+      PYTHON_VERSION: "3.8"
       PYTHON_ARCH: "64"
-      PYTHON_HOME: "C:\\Python34-x64"
+      PYTHON_HOME: "C:\\Python38-x64"
       db: postgresql
-    - TOXENV: "py35-postgres-w32"
-      PYTHON_VERSION: "3.5"
+    - TOXENV: "py39-postgres-w32"
+      PYTHON_VERSION: "3.9"
       PYTHON_ARCH: "32"
-      PYTHON_HOME: "C:\\Python35"
+      PYTHON_HOME: "C:\\Python39"
       db: postgresql
-    - TOXENV: "py35-postgres-w32"
-      PYTHON_VERSION: "3.5"
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+    - TOXENV: "py39-postgres-w32"
+      PYTHON_VERSION: "3.9"
       PYTHON_ARCH: "64"
-      PYTHON_HOME: "C:\\Python35-x64"
-      db: postgresql
-    - TOXENV: "py36-postgres-w32"
-      PYTHON_VERSION: "3.6"
-      PYTHON_ARCH: "32"
-      PYTHON_HOME: "C:\\Python36"
-      db: postgresql
-    - TOXENV: "py36-postgres-w32"
-      PYTHON_VERSION: "3.6"
-      PYTHON_ARCH: "64"
-      PYTHON_HOME: "C:\\Python36-x64"
+      PYTHON_HOME: "C:\\Python39-x64"
       db: postgresql
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
     - TOXENV: "py27-sqlite-w32"
       PYTHON_VERSION: "2.7"
       PYTHON_ARCH: "32"
       PYTHON_HOME: "C:\\Python27"
-    - TOXENV: "py27-sqlite-w32"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "64"
-      PYTHON_HOME: "C:\\Python27-x64"
-    - TOXENV: "py34-sqlite-w32"
-      PYTHON_VERSION: "3.4"
-      PYTHON_ARCH: "32"
-      PYTHON_HOME: "C:\\Python34"
-    - TOXENV: "py34-sqlite-w32"
-      PYTHON_VERSION: "3.4"
+    - TOXENV: "py37-sqlite-w32"
+      PYTHON_VERSION: "3.7"
       PYTHON_ARCH: "64"
-      PYTHON_HOME: "C:\\Python34-x64"
-    - TOXENV: "py35-sqlite-w32"
-      PYTHON_VERSION: "3.5"
-      PYTHON_ARCH: "32"
-      PYTHON_HOME: "C:\\Python35"
-    - TOXENV: "py35-sqlite-w32"
-      PYTHON_VERSION: "3.5"
+      PYTHON_HOME: "C:\\Python37-x64"
+    - TOXENV: "py38-sqlite-w32"
+      PYTHON_VERSION: "3.8"
       PYTHON_ARCH: "64"
-      PYTHON_HOME: "C:\\Python35-x64"
-    - TOXENV: "py36-sqlite-w32"
-      PYTHON_VERSION: "3.6"
+      PYTHON_HOME: "C:\\Python38-x64"
+    - TOXENV: "py39-sqlite-w32"
+      PYTHON_VERSION: "3.9"
       PYTHON_ARCH: "32"
-      PYTHON_HOME: "C:\\Python36"
-    - TOXENV: "py36-sqlite-w32"
-      PYTHON_VERSION: "3.6"
+      PYTHON_HOME: "C:\\Python39"
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+    - TOXENV: "py39-sqlite-w32"
+      PYTHON_VERSION: "3.9"
       PYTHON_ARCH: "64"
-      PYTHON_HOME: "C:\\Python36-x64"
+      PYTHON_HOME: "C:\\Python39-x64"
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
     - TOXENV: "py27-flake8"
       PYTHON_VERSION: "2.7"
       PYTHON_ARCH: "32"
       PYTHON_HOME: "C:\\Python27"
-    - TOXENV: "py34-flake8"
-      PYTHON_VERSION: "3.4"
+    - TOXENV: "py39-flake8"
+      PYTHON_VERSION: "3.9"
       PYTHON_ARCH: "64"
-      PYTHON_HOME: "C:\\Python34-x64"
+      PYTHON_HOME: "C:\\Python39-x64"
 
 install:
   # Ensure we use the right python version
@@ -143,8 +102,9 @@ install:
   - "SET TOXPYTHON=%PYTHON_HOME%\\python.exe"
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
+  - "python -m pip install --upgrade \"pip<21\" \"setuptools<44\""
+  - "pip install --upgrade \"tox>=3.15\" ppu"
   - "pip --version"
-  - "pip install --upgrade pip setuptools tox ppu"
 
 # No build step - we don't have C extensions
 build: false