Remove the 64bit environment from the basic AppVeyor test matrix. Cha…

…nge the ``tox.ini`` template (``test_matrix_configurator=yes``) to allow overriding the interpreter (so that 64bit interpreter actually gets used on AppVeyor).
ionelmc · Jul 3, 2015 · 418d8ab · 418d8ab
1 parent ad7dba1
commit 418d8ab
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 37 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -3,6 +3,13 @@ Changelog
 
 Use cookiecutter's ``--checkout`` options to use a specific version.
 
+v1.8 (2015-07-03)
+-----------------
+
+* Remove the 64bit environment from the basic AppVeyor test matrix.
+* Change the ``tox.ini`` template (``test_matrix_configurator=yes``) to allow overriding the
+  interpreter (so that 64bit interpreter actually gets used on AppVeyor).
+
 v1.7.1 (2015-07-03)
 -------------------
 

diff --git a/{{cookiecutter.repo_name}}/appveyor.yml b/{{cookiecutter.repo_name}}/appveyor.yml
@@ -14,72 +14,36 @@ environment:
       PYTHON_HOME: "C:\\Python27"
       PYTHON_VERSION: "2.7"
       PYTHON_ARCH: "32"
-    - TOXENV: "2.7"
-      TOXPYTHON: "C:\\Python27-x64\\python.exe"
-      WINDOWS_SDK_VERSION: "v7.0"
-      PYTHON_HOME: "C:\\Python27-x64"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "64"
     - TOXENV: "2.7-nocover"
       TOXPYTHON: "C:\\Python27\\python.exe"
       WINDOWS_SDK_VERSION: "v7.0"
       PYTHON_HOME: "C:\\Python27"
       PYTHON_VERSION: "2.7"
       PYTHON_ARCH: "32"
-    - TOXENV: "2.7-nocover"
-      TOXPYTHON: "C:\\Python27-x64\\python.exe"
-      WINDOWS_SDK_VERSION: "v7.0"
-      PYTHON_HOME: "C:\\Python27-x64"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "64"
     - TOXENV: "3.3"
       TOXPYTHON: "C:\\Python33\\python.exe"
       WINDOWS_SDK_VERSION: "v7.1"
       PYTHON_HOME: "C:\\Python33"
       PYTHON_VERSION: "3.3"
       PYTHON_ARCH: "32"
-    - TOXENV: "3.3"
-      TOXPYTHON: "C:\\Python33-x64\\python.exe"
-      WINDOWS_SDK_VERSION: "v7.1"
-      PYTHON_HOME: "C:\\Python33-x64"
-      PYTHON_VERSION: "3.3"
-      PYTHON_ARCH: "64"
     - TOXENV: "3.3-nocover"
       TOXPYTHON: "C:\\Python33\\python.exe"
       WINDOWS_SDK_VERSION: "v7.1"
       PYTHON_HOME: "C:\\Python33"
       PYTHON_VERSION: "3.3"
       PYTHON_ARCH: "32"
-    - TOXENV: "3.3-nocover"
-      TOXPYTHON: "C:\\Python33-x64\\python.exe"
-      WINDOWS_SDK_VERSION: "v7.1"
-      PYTHON_HOME: "C:\\Python33-x64"
-      PYTHON_VERSION: "3.3"
-      PYTHON_ARCH: "64"
     - TOXENV: "3.4"
       TOXPYTHON: "C:\\Python34\\python.exe"
       WINDOWS_SDK_VERSION: "v7.1"
       PYTHON_HOME: "C:\\Python34"
       PYTHON_VERSION: "3.4"
       PYTHON_ARCH: "32"
-    - TOXENV: "3.4"
-      TOXPYTHON: "C:\\Python34-x64\\python.exe"
-      WINDOWS_SDK_VERSION: "v7.1"
-      PYTHON_HOME: "C:\\Python34-x64"
-      PYTHON_VERSION: "3.4"
-      PYTHON_ARCH: "64"
     - TOXENV: "3.4-nocover"
       TOXPYTHON: "C:\\Python34\\python.exe"
       WINDOWS_SDK_VERSION: "v7.1"
       PYTHON_HOME: "C:\\Python34"
       PYTHON_VERSION: "3.4"
       PYTHON_ARCH: "32"
-    - TOXENV: "3.4-nocover"
-      TOXPYTHON: "C:\\Python34-x64\\python.exe"
-      WINDOWS_SDK_VERSION: "v7.1"
-      PYTHON_HOME: "C:\\Python34-x64"
-      PYTHON_VERSION: "3.4"
-      PYTHON_ARCH: "64"
 init:
   - "ECHO %TOXENV%"
   - ps: "ls C:\\Python*"

diff --git a/{{cookiecutter.repo_name}}/ci/templates/tox.ini b/{{cookiecutter.repo_name}}/ci/templates/tox.ini
@@ -119,7 +119,7 @@ deps = coverage
 
 {% for env, config in tox_environments|dictsort %}
 [testenv:{{ env }}]
-basepython = {{ config.python }}
+basepython = {env:TOXPYTHON:{{ config.python }}}
 {% if config.cover or config.env_vars %}
 setenv =
     {[testenv]setenv}