summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2020-06-24 19:36:30 +0200
committerFlorian Bruhin <me@the-compiler.org>2020-06-24 19:36:30 +0200
commit76e8debbc08288c5321be34a5f747e58ab997abe (patch)
tree8e4efcab172e2925c9359780797aba2fb2b76a34 /tox.ini
parenta0f078da38603f8e6556b5c1c0fb836426943ddd (diff)
downloadqutebrowser-76e8debbc08288c5321be34a5f747e58ab997abe.tar.gz
qutebrowser-76e8debbc08288c5321be34a5f747e58ab997abe.zip
ci: Switch from TRAVIS to CI env vars
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini4
1 files changed, 2 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini
index aafa19331..f8b258d7e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,7 @@ setenv =
pyqt{,57,59,510,511,512,513,514,515}: LINK_PYQT_SKIP=true
pyqt{,57,59,510,511,512,513,514,515}: QUTE_BDD_WEBENGINE=true
cov: PYTEST_ADDOPTS=--cov --cov-report xml --cov-report=html --cov-report=
-passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI TRAVIS XDG_* QUTE_* DOCKER QT_QUICK_BACKEND
+passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI XDG_* QUTE_* DOCKER QT_QUICK_BACKEND
basepython =
py35: {env:PYTHON:python3.5}
py36: {env:PYTHON:python3.6}
@@ -148,7 +148,7 @@ commands =
basepython = {env:PYTHON:python3}
pip_version = pip
whitelist_externals = git
-passenv = TRAVIS TRAVIS_PULL_REQUEST
+passenv = CI TRAVIS_PULL_REQUEST
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/misc/requirements/requirements-pyqt.txt