Use tox-appveyor plugin instead of TOXPYTHON environment variable

takluyver · takluyver · commit 98e3095b9f7f · 2019-04-01T11:58:08.000+01:00
diff --git a/appveyor.yml b/appveyor.yml
@@ -8,92 +8,85 @@ environment:
     ### USING HDF5 1.8 ###
     - PYTHON: "C:\\Python27"
       TOXENV: "py27-test-deps"
-      TOXPYTHON: "%PYTHON%\\python.exe"
       HDF5_VSVERSION: "9"
       HDF5_DIR: "C:\\hdf5\\%HDF5_VERSION%\\%HDF5_VSVERSION%"
 
     - PYTHON: "C:\\Python34"
       TOXENV: "py34-test-deps"
-      TOXPYTHON: "%PYTHON%\\python.exe"
       HDF5_VSVERSION: "10"
       HDF5_DIR: "C:\\hdf5\\%HDF5_VERSION%\\%HDF5_VSVERSION%"
 
     - PYTHON: "C:\\Python35"
       TOXENV: "py35-test-deps"
-      TOXPYTHON: "%PYTHON%\\python.exe"
       HDF5_VSVERSION: "14"
       HDF5_DIR: "C:\\hdf5\\%HDF5_VERSION%\\%HDF5_VSVERSION%"
 
     - PYTHON: "C:\\Python36"
       TOXENV: "py36-test-deps"
-      TOXPYTHON: "%PYTHON%\\python.exe"
       HDF5_VSVERSION: "14"
       HDF5_DIR: "C:\\hdf5\\%HDF5_VERSION%\\%HDF5_VSVERSION%"
 
     - PYTHON: "C:\\Python27-x64"
       TOXENV: "py27-test-deps"
-      TOXPYTHON: "%PYTHON%\\python.exe"
+      TOX_APPVEYOR_X64: "1"
       HDF5_VSVERSION: "9-64"
       HDF5_DIR: "C:\\hdf5\\%HDF5_VERSION%\\%HDF5_VSVERSION%"
 
     - PYTHON: "C:\\Python34-x64"
       TOXENV: "py34-test-deps"
-      TOXPYTHON: "%PYTHON%\\python.exe"
+      TOX_APPVEYOR_X64: "1"
       HDF5_VSVERSION: "10-64"
       DISTUTILS_USE_SDK: "1"
       HDF5_DIR: "C:\\hdf5\\%HDF5_VERSION%\\%HDF5_VSVERSION%"
 
     - PYTHON: "C:\\Python35-x64"
       TOXENV: "py35-test-deps"
-      TOXPYTHON: "%PYTHON%\\python.exe"
+      TOX_APPVEYOR_X64: "1"
       HDF5_VSVERSION: "14-64"
       HDF5_DIR: "C:\\hdf5\\%HDF5_VERSION%\\%HDF5_VSVERSION%"
 
     - PYTHON: "C:\\Python36-x64"
       TOXENV: "py36-test-deps"
-      TOXPYTHON: "%PYTHON%\\python.exe"
+      TOX_APPVEYOR_X64: "1"
       HDF5_VSVERSION: "14-64"
       HDF5_DIR: "C:\\hdf5\\%HDF5_VERSION%\\%HDF5_VSVERSION%"
 
     ### USING HDF5 1.10 ###
     - PYTHON: "C:\\Python27"
       TOXENV: "py27-test-deps"
-      TOXPYTHON: "%PYTHON%\\python.exe"
       HDF5_VSVERSION: "9"
       HDF5_DIR: "C:\\hdf5\\%HDF5_VERSION%\\%HDF5_VSVERSION%"
       HDF5_VERSION: "1.10.1"
 
     - PYTHON: "C:\\Python35"
       TOXENV: "py35-test-deps"
-      TOXPYTHON: "%PYTHON%\\python.exe"
       HDF5_VSVERSION: "14"
       HDF5_DIR: "C:\\hdf5\\%HDF5_VERSION%\\%HDF5_VSVERSION%"
       HDF5_VERSION: "1.10.1"
 
     - PYTHON: "C:\\Python36"
       TOXENV: "py36-test-deps"
-      TOXPYTHON: "%PYTHON%\\python.exe"
       HDF5_VSVERSION: "14"
       HDF5_DIR: "C:\\hdf5\\%HDF5_VERSION%\\%HDF5_VSVERSION%"
       HDF5_VERSION: "1.10.1"
 
     - PYTHON: "C:\\Python27-x64"
       TOXENV: "py27-test-deps"
-      TOXPYTHON: "%PYTHON%\\python.exe"
+      TOX_APPVEYOR_X64: "1"
       HDF5_VSVERSION: "9-64"
       HDF5_DIR: "C:\\hdf5\\%HDF5_VERSION%\\%HDF5_VSVERSION%"
       HDF5_VERSION: "1.10.1"
 
     - PYTHON: "C:\\Python35-x64"
       TOXENV: "py35-test-deps"
-      TOXPYTHON: "%PYTHON%\\python.exe"
+      TOX_APPVEYOR_X64: "1"
       HDF5_VSVERSION: "14-64"
       HDF5_DIR: "C:\\hdf5\\%HDF5_VERSION%\\%HDF5_VSVERSION%"
       HDF5_VERSION: "1.10.1"
 
     - PYTHON: "C:\\Python36-x64"
       TOXENV: "py36-test-deps"
-      TOXPYTHON: "%PYTHON%\\python.exe"
+      TOX_APPVEYOR_X64: "1"
       HDF5_VSVERSION: "14-64"
       HDF5_DIR: "C:\\hdf5\\%HDF5_VERSION%\\%HDF5_VSVERSION%"
       HDF5_VERSION: "1.10.1"
@@ -104,7 +97,7 @@ install:
   - "py -3.5 -m pip install --upgrade wheel pip setuptools"
   - "py -3.5 -m pip install requests"
   - "py -3.5 ci\\appveyor\\get_hdf5.py"
-  - "py -3.5 -m pip install tox codecov"
+  - "py -3.5 -m pip install tox codecov tox-appveyor"
 
 build: off
 
diff --git a/tox.ini b/tox.ini
@@ -26,27 +26,19 @@ changedir =
     test: {toxworkdir}
 passenv =
     HDF5_DIR
-    TOXPYTHON
 setenv =
     COVERAGE_FILE={toxinidir}/.coverage
 # needed otherwise coverage cannot find the file when reporting
-basepython =
-    pypy3: {env:TOXPYTHON:pypy3}
-    py27: {env:TOXPYTHON:python2.7}
-    py34: {env:TOXPYTHON:python3.4}
-    py35: {env:TOXPYTHON:python3.5}
-    py36: {env:TOXPYTHON:python3.6}
-    py37: {env:TOXPYTHON:python3.7}
+
 pip_pre =
     pre: True
 
 [testenv:nightly]
 pip_pre = True
-basepython = {env:TOXPYTHON:python3.8}
+basepython = python3.8
 
 [testenv:docs]
 skip_install=True
-basepython = {env:TOXPYTHON:python}
 changedir=docs
 deps=
     sphinx
@@ -55,7 +47,6 @@ commands=
 
 [testenv:check-manifest]
 skip_install=True
-basepython = {env:TOXPYTHON:python}
 deps=check-manifest
 setenv =
     CHECK_MANIFEST=true
@@ -64,14 +55,12 @@ commands=
 
 [testenv:checkreadme]
 skip_install=True
-basepython = {env:TOXPYTHON:python}
 deps=readme_renderer
 commands=
     python setup.py check -s -r
 
 [testenv:pre-commit]
 skip_install=True
-basepython = {env:TOXPYTHON:python}
 deps=pre-commit
 passenv = HOMEPATH SSH_AUTH_SOCK
 commands=
