X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=appveyor.yml;h=509c25c5431c77a9b9b112db9cea59235c2bd746;hb=b35ea76744f1e85c1e7d91ed1bbc55b410e4848d;hp=67229081dda94e28487f4a8537f5d1896db8e8de;hpb=c9b64e869f9e673b0d213be3f7d098ef00e4fe1c;p=ppu.git

diff --git a/appveyor.yml b/appveyor.yml
index 6722908..509c25c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,46 +18,30 @@ clone_depth: 50
 
 environment:
   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:\\Python33"
-      PYTHON_VERSION: "3.3"
-      PYTHON_ARCH: "32"
-      TOX_ENV: "py33"
-    - PYTHON_HOME: "C:\\Python33-x64"
+      PYTHON_HOME: "C:\\Python27"
+    - TOXENV: "py33"
       PYTHON_VERSION: "3.3"
       PYTHON_ARCH: "64"
-      TOX_ENV: "py33"
-    - 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_HOME: "C:\\Python33-x64"
+    - TOXENV: "py36"
       PYTHON_VERSION: "3.6"
       PYTHON_ARCH: "32"
-      TOX_ENV: "py36"
-    - PYTHON_HOME: "C:\\Python36-x64"
+      PYTHON_HOME: "C:\\Python36"
+    - TOXENV: "py36"
       PYTHON_VERSION: "3.6"
       PYTHON_ARCH: "64"
-      TOX_ENV: "py36"
+      PYTHON_HOME: "C:\\Python36-x64"
+    - TOXENV: "py27-flake8"
+      PYTHON_VERSION: "2.7"
+      PYTHON_ARCH: "32"
+      PYTHON_HOME: "C:\\Python27"
+    - TOXENV: "py34-flake8"
+      PYTHON_VERSION: "3.4"
+      PYTHON_ARCH: "64"
+      PYTHON_HOME: "C:\\Python34-x64"
 
 install:
   # Ensure we use the right python version
@@ -65,14 +49,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 <= 2.9.1\""
   - "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:
   - "scripts\\remove-old-files.py -o 180 %LOCALAPPDATA%\\pip\\Cache"