X-Git-Url: https://git.phdru.name/?p=cookiecutter.git;a=blobdiff_plain;f=project_template%2Fappveyor.yml;h=0a2e20d001114b3e9c21397a4314aa66c54ed1ab;hp=6107a563d5a6fb7dfdc690c683dda2ff216faede;hb=6f0dd1644b34df325a2677f61b2b9e4c0d49886c;hpb=b2027c2ae3aa07681bd9881b9f3afc173fcd9782

diff --git a/project_template/appveyor.yml b/project_template/appveyor.yml
index 6107a56..0a2e20d 100644
--- a/project_template/appveyor.yml
+++ b/project_template/appveyor.yml
@@ -2,11 +2,10 @@
 # Heavily inspired by Oliver Grisel's appveyor-demo (https://github.com/ogrisel/python-appveyor-demo)
 version: '{branch}-{build}'
 
-# Only test maint, master and pull requests; skip tags.
+# Only test master and pull requests; skip tags.
 # Other branches can allow themselves.
 branches:
   only:
-    - maint
     - master
 skip_branch_with_pr: false
 skip_tags: true
@@ -25,46 +24,46 @@ environment:
     CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\run_with_env.cmd"
 
   matrix:
-    - PYTHON_HOME: "C:\\Python27"
+    - TOXENV: "py27"
       PYTHON_VERSION: "2.7"
       PYTHON_ARCH: "32"
-      TOX_ENV: "py27"
-    - PYTHON_HOME: "C:\\Python27-x64"
+      PYTHON_HOME: "C:\\Python27"
+    - TOXENV: "py27"
       PYTHON_VERSION: "2.7"
       PYTHON_ARCH: "64"
-      TOX_ENV: "py27"
-    - PYTHON_HOME: "C:\\Python33"
+      PYTHON_HOME: "C:\\Python27-x64"
+    - TOXENV: "py33"
       PYTHON_VERSION: "3.3"
       PYTHON_ARCH: "32"
-      TOX_ENV: "py33"
-    - PYTHON_HOME: "C:\\Python33-x64"
+      PYTHON_HOME: "C:\\Python33"
+    - TOXENV: "py33"
       PYTHON_VERSION: "3.3"
       PYTHON_ARCH: "64"
-      TOX_ENV: "py33"
-    - PYTHON_HOME: "C:\\Python34"
+      PYTHON_HOME: "C:\\Python33-x64"
+    - TOXENV: "py34"
       PYTHON_VERSION: "3.4"
       PYTHON_ARCH: "32"
-      TOX_ENV: "py34"
-    - PYTHON_HOME: "C:\\Python34-x64"
+      PYTHON_HOME: "C:\\Python34"
+    - TOXENV: "py34"
       PYTHON_VERSION: "3.4"
       PYTHON_ARCH: "64"
-      TOX_ENV: "py34"
-    - PYTHON_HOME: "C:\\Python35"
+      PYTHON_HOME: "C:\\Python34-x64"
+    - TOXENV: "py35"
       PYTHON_VERSION: "3.5"
       PYTHON_ARCH: "32"
-      TOX_ENV: "py35"
-    - PYTHON_HOME: "C:\\Python35-x64"
+      PYTHON_HOME: "C:\\Python35"
+    - TOXENV: "py35"
       PYTHON_VERSION: "3.5"
       PYTHON_ARCH: "64"
-      TOX_ENV: "py35"
-    - PYTHON_HOME: "C:\\Python36"
+      PYTHON_HOME: "C:\\Python35-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"
 
 install:
   # Ensure we use the right python version
@@ -72,21 +71,28 @@ 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"
 
-# No build step - _namemapper extension will be built under tox
+# No build step - we don't have C extensions
 build: false
 
 test_script:
-  - "%CMD_IN_ENV% tox -e %TOX_ENV%"
+  - "%CMD_IN_ENV% tox"
 
 #after_test:
-#  # If tests are successful, create binary package
-#  - "pip install wheel"
-#  - "%CMD_IN_ENV% python setup.py bdist_wheel"
-#  - ps: "ls dist"
+#  # If tests are successful and we've tested a tag, create binary package
+#  - if "%APPVEYOR_REPO_TAG%" == "true" (
+#      pip install --upgrade wheel &&
+#      %CMD_IN_ENV% python setup.py bdist_wheel &&
+#      ls dist
+#    )
+#  - remove-old-files.py -o 180 %LOCALAPPDATA%\\pip\\Cache
 #
 #artifacts:
 #  # Archive the generated packages in the ci.appveyor.com build report
 #  - path: dist\*
+
+after_test:
+  - "remove-old-files.py -o 180 %LOCALAPPDATA%\\pip\\Cache"