Merge pull request #132 from rjw57/allow-any-python-3

tox: user any python3 rather than specifying python3.4
rjw57 · Nov 4, 2016 · 076e20b · 076e20b
2 parents b08b519 + ae4e51d
commit 076e20b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,9 +9,9 @@ before_install:
     - sudo apt-get update -qq
     - sudo apt-get install -y opencl-headers fglrx
 env:
-    - TOX_ENV=py34
+    - TOX_ENV=py3
     - TOX_ENV=py27
-    - TOX_ENV=py34-opencl
+    - TOX_ENV=py3-opencl
     - TOX_ENV=py27-opencl
     - TOX_ENV=docs
 install:

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist=py{27,34}{,-opencl},docs
+envlist=py{27,3}{,-opencl},docs
 
 [testenv:docs]
 deps=
@@ -8,11 +8,14 @@ deps=
 commands=
     python setup.py build_sphinx
 
+[testenv:python3]
+basepython=python3
+
 [testenv]
 deps=
     -rtests/requirements.txt
 commands=
     # We can't list these in deps since pyopencl moans if numpy is not
     # fully installed at pip-install time.
-    py{27,34}-opencl: pip install -rtests/opencl-requirements.txt
+    py{27,3}-opencl: pip install -rtests/opencl-requirements.txt
     py.test --cov=dtcwt/ --cov-report=term {posargs}