Skip to content

Commit 418d8ab

Browse files
committed
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).
1 parent ad7dba1 commit 418d8ab

File tree

3 files changed

+8
-37
lines changed

3 files changed

+8
-37
lines changed

CHANGELOG.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@ Changelog
33

44
Use cookiecutter's ``--checkout`` options to use a specific version.
55

6+
v1.8 (2015-07-03)
7+
-----------------
8+
9+
* Remove the 64bit environment from the basic AppVeyor test matrix.
10+
* Change the ``tox.ini`` template (``test_matrix_configurator=yes``) to allow overriding the
11+
interpreter (so that 64bit interpreter actually gets used on AppVeyor).
12+
613
v1.7.1 (2015-07-03)
714
-------------------
815

{{cookiecutter.repo_name}}/appveyor.yml

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -14,72 +14,36 @@ environment:
1414
PYTHON_HOME: "C:\\Python27"
1515
PYTHON_VERSION: "2.7"
1616
PYTHON_ARCH: "32"
17-
- TOXENV: "2.7"
18-
TOXPYTHON: "C:\\Python27-x64\\python.exe"
19-
WINDOWS_SDK_VERSION: "v7.0"
20-
PYTHON_HOME: "C:\\Python27-x64"
21-
PYTHON_VERSION: "2.7"
22-
PYTHON_ARCH: "64"
2317
- TOXENV: "2.7-nocover"
2418
TOXPYTHON: "C:\\Python27\\python.exe"
2519
WINDOWS_SDK_VERSION: "v7.0"
2620
PYTHON_HOME: "C:\\Python27"
2721
PYTHON_VERSION: "2.7"
2822
PYTHON_ARCH: "32"
29-
- TOXENV: "2.7-nocover"
30-
TOXPYTHON: "C:\\Python27-x64\\python.exe"
31-
WINDOWS_SDK_VERSION: "v7.0"
32-
PYTHON_HOME: "C:\\Python27-x64"
33-
PYTHON_VERSION: "2.7"
34-
PYTHON_ARCH: "64"
3523
- TOXENV: "3.3"
3624
TOXPYTHON: "C:\\Python33\\python.exe"
3725
WINDOWS_SDK_VERSION: "v7.1"
3826
PYTHON_HOME: "C:\\Python33"
3927
PYTHON_VERSION: "3.3"
4028
PYTHON_ARCH: "32"
41-
- TOXENV: "3.3"
42-
TOXPYTHON: "C:\\Python33-x64\\python.exe"
43-
WINDOWS_SDK_VERSION: "v7.1"
44-
PYTHON_HOME: "C:\\Python33-x64"
45-
PYTHON_VERSION: "3.3"
46-
PYTHON_ARCH: "64"
4729
- TOXENV: "3.3-nocover"
4830
TOXPYTHON: "C:\\Python33\\python.exe"
4931
WINDOWS_SDK_VERSION: "v7.1"
5032
PYTHON_HOME: "C:\\Python33"
5133
PYTHON_VERSION: "3.3"
5234
PYTHON_ARCH: "32"
53-
- TOXENV: "3.3-nocover"
54-
TOXPYTHON: "C:\\Python33-x64\\python.exe"
55-
WINDOWS_SDK_VERSION: "v7.1"
56-
PYTHON_HOME: "C:\\Python33-x64"
57-
PYTHON_VERSION: "3.3"
58-
PYTHON_ARCH: "64"
5935
- TOXENV: "3.4"
6036
TOXPYTHON: "C:\\Python34\\python.exe"
6137
WINDOWS_SDK_VERSION: "v7.1"
6238
PYTHON_HOME: "C:\\Python34"
6339
PYTHON_VERSION: "3.4"
6440
PYTHON_ARCH: "32"
65-
- TOXENV: "3.4"
66-
TOXPYTHON: "C:\\Python34-x64\\python.exe"
67-
WINDOWS_SDK_VERSION: "v7.1"
68-
PYTHON_HOME: "C:\\Python34-x64"
69-
PYTHON_VERSION: "3.4"
70-
PYTHON_ARCH: "64"
7141
- TOXENV: "3.4-nocover"
7242
TOXPYTHON: "C:\\Python34\\python.exe"
7343
WINDOWS_SDK_VERSION: "v7.1"
7444
PYTHON_HOME: "C:\\Python34"
7545
PYTHON_VERSION: "3.4"
7646
PYTHON_ARCH: "32"
77-
- TOXENV: "3.4-nocover"
78-
TOXPYTHON: "C:\\Python34-x64\\python.exe"
79-
WINDOWS_SDK_VERSION: "v7.1"
80-
PYTHON_HOME: "C:\\Python34-x64"
81-
PYTHON_VERSION: "3.4"
82-
PYTHON_ARCH: "64"
8347
init:
8448
- "ECHO %TOXENV%"
8549
- ps: "ls C:\\Python*"

{{cookiecutter.repo_name}}/ci/templates/tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ deps = coverage
119119

120120
{% for env, config in tox_environments|dictsort %}
121121
[testenv:{{ env }}]
122-
basepython = {{ config.python }}
122+
basepython = {env:TOXPYTHON:{{ config.python }}}
123123
{% if config.cover or config.env_vars %}
124124
setenv =
125125
{[testenv]setenv}

0 commit comments

Comments
 (0)