ci testing stuff

aburrell · Nov 19, 2015 · 09075d1 · 09075d1
1 parent 5a32f8c
commit 09075d1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -6,56 +6,56 @@ environment:
     TOX_USE_SITEPACKAGES: true
   matrix:
     - TOXENV: '2.7-nocover'
-      TOXPYTHON: C:\mcpython27\python.exe
+      TOXPYTHON: C:\python27\python.exe
       WINDOWS_SDK_VERSION: v7.0
-      PYTHON_HOME: C:\mcpython27
+      PYTHON_HOME: C:\python27
       PYTHON_VERSION: '2.7'
       PYTHON_ARCH: '32'
       MINICONDA_HOME: C:\Miniconda-x64
     - TOXENV: '2.7-nocover'
-      TOXPYTHON: C:\mcpython27-x64\python.exe
+      TOXPYTHON: C:\python27-x64\python.exe
       WINDOWS_SDK_VERSION: v7.0
-      PYTHON_HOME: C:\mcpython27-x64
+      PYTHON_HOME: C:\python27-x64
       PYTHON_VERSION: '2.7'
       PYTHON_ARCH: '64'
       MINICONDA_HOME: C:\Miniconda-x64
     - TOXENV: '3.3-nocover'
-      TOXPYTHON: C:\mcpython33\python.exe
+      TOXPYTHON: C:\python33\python.exe
       WINDOWS_SDK_VERSION: v7.1
-      PYTHON_HOME: C:\mcpython33
+      PYTHON_HOME: C:\python33
       PYTHON_VERSION: '3.3'
       PYTHON_ARCH: '32'
       MINICONDA_HOME: C:\Miniconda-x64
     - TOXENV: '3.3-nocover'
-      TOXPYTHON: C:\mcpython33-x64\python.exe
+      TOXPYTHON: C:\python33-x64\python.exe
       WINDOWS_SDK_VERSION: v7.1
-      PYTHON_HOME: C:\mcpython33-x64
+      PYTHON_HOME: C:\python33-x64
       PYTHON_VERSION: '3.3'
       PYTHON_ARCH: '64'
       MINICONDA_HOME: C:\Miniconda-x64
     - TOXENV: '3.4-nocover'
-      TOXPYTHON: C:\mcpython34\python.exe
+      TOXPYTHON: C:\python34\python.exe
       WINDOWS_SDK_VERSION: v7.0
-      PYTHON_HOME: C:\mcpython34
+      PYTHON_HOME: C:\python34
       PYTHON_VERSION: '3.4'
       PYTHON_ARCH: '32'
       MINICONDA_HOME: C:\Miniconda-x64
     - TOXENV: '3.4-nocover'
-      TOXPYTHON: C:\mcpython34-x64\python.exe
+      TOXPYTHON: C:\python34-x64\python.exe
       WINDOWS_SDK_VERSION: v7.1
-      PYTHON_HOME: C:\mcpython34-x64
+      PYTHON_HOME: C:\python34-x64
       PYTHON_VERSION: '3.4'
       PYTHON_ARCH: '64'
       MINICONDA_HOME: C:\Miniconda-x64
     - TOXENV: '3.5-nocover'
-      TOXPYTHON: C:\mcpython35\python.exe
-      PYTHON_HOME: C:\mcpython35
+      TOXPYTHON: C:\python35\python.exe
+      PYTHON_HOME: C:\python35
       PYTHON_VERSION: '3.5'
       PYTHON_ARCH: '32'
       MINICONDA_HOME: C:\Miniconda-x64
     - TOXENV: '3.5-nocover'
-      TOXPYTHON: C:\mcpython35-x64\python.exe
-      PYTHON_HOME: C:\mcpython35-x64
+      TOXPYTHON: C:\python35-x64\python.exe
+      PYTHON_HOME: C:\python35-x64
       PYTHON_VERSION: '3.5'
       PYTHON_ARCH: '64'
       MINICONDA_HOME: C:\Miniconda-x64

diff --git a/ci/templates/appveyor.yml b/ci/templates/appveyor.yml
@@ -7,24 +7,24 @@ environment:
   matrix:
 {% for env, config in tox_environments|dictsort %}{% if config.python in ('python2.6', 'python2.7', 'python3.3', 'python3.4', 'python3.5') and not config.cover %}
     - TOXENV: '{{ env }}{% if config.cover %},codecov{% endif %}'
-      TOXPYTHON: C:\mc{{ config.python.replace('.', '') }}\python.exe
+      TOXPYTHON: C:\{{ config.python.replace('.', '') }}\python.exe
       {%- if config.python != 'python3.5' %}
 
       WINDOWS_SDK_VERSION: v7.{{ '1' if config.python[-1] == '3' else '0' }}
       {%- endif %}
 
-      PYTHON_HOME: C:\mc{{ config.python.replace('.', '') }}
+      PYTHON_HOME: C:\{{ config.python.replace('.', '') }}
       PYTHON_VERSION: '{{ config.python[-3:] }}'
       PYTHON_ARCH: '32'
       MINICONDA_HOME: C:\Miniconda-x64
     - TOXENV: '{{ env }}{% if config.cover %},codecov{% endif %}'
-      TOXPYTHON: C:\mc{{ config.python.replace('.', '') }}-x64\python.exe
+      TOXPYTHON: C:\{{ config.python.replace('.', '') }}-x64\python.exe
       {%- if config.python != 'python3.5' %}
 
       WINDOWS_SDK_VERSION: v7.{{ '1' if config.python[-3] == '3' else '0' }}
       {%- endif %}
 
-      PYTHON_HOME: C:\mc{{ config.python.replace('.', '') }}-x64
+      PYTHON_HOME: C:\{{ config.python.replace('.', '') }}-x64
       PYTHON_VERSION: '{{ config.python[-3:] }}'
       PYTHON_ARCH: '64'
       MINICONDA_HOME: C:\Miniconda-x64