summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <git@the-compiler.org>2018-07-03 13:32:53 +0200
committerFlorian Bruhin <git@the-compiler.org>2018-07-03 13:32:53 +0200
commit8c11c516b48412787bec4dd0c639bed72bc8d33c (patch)
tree5c0b9915121169f255e867bcdd2676ce681f38ca
parent857288b283075940b25c29f6beb01ccd5d548139 (diff)
downloadqutebrowser-8c11c516b48412787bec4dd0c639bed72bc8d33c.tar.gz
qutebrowser-8c11c516b48412787bec4dd0c639bed72bc8d33c.zip
tox: Always allow setting python via envvar
-rw-r--r--.appveyor.yml1
-rw-r--r--tox.ini6
2 files changed, 3 insertions, 4 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
index f51b5e727..92a20c0bd 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -16,5 +16,4 @@ install:
- 'set PATH=C:\Python36-x64;%PATH'
test_script:
- - '%PYTHON% -c "from PyQt5 import QtWebEngineWidgets"'
- '%PYTHON% -m tox -e %TESTENV%'
diff --git a/tox.ini b/tox.ini
index c3b8a258b..21baa7be5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,9 +18,9 @@ setenv =
cov: PYTEST_ADDOPTS=--cov --cov-report xml --cov-report=html --cov-report=
passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI TRAVIS XDG_* QUTE_* DOCKER
basepython =
- py35: python3.5
- py36: python3.6
- py37: python3.7
+ py35: {env:PYTHON:python3.5}
+ py36: {env:PYTHON:python3.6}
+ py37: {env:PYTHON:python3.7}
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/misc/requirements/requirements-tests.txt