diff options
| author | Ryan Farley <ryan.farley@gmx.com> | 2017-12-01 10:51:41 -0600 |
|---|---|---|
| committer | Ryan Farley <ryan.farley@gmx.com> | 2017-12-01 10:51:41 -0600 |
| commit | df6ff55b7a34d543b9235bf71f0131b2598ff1c9 (patch) | |
| tree | e152e10bbb8a2effb53856cb0b153213ccf38411 /tox.ini | |
| parent | 49485ca220543ce9fbcc48da9f3b69feef695822 (diff) | |
| download | qutebrowser-df6ff55b7a34d543b9235bf71f0131b2598ff1c9.tar.gz qutebrowser-df6ff55b7a34d543b9235bf71f0131b2598ff1c9.zip | |
allow pytest to default to link_pyqt
link_pyqt now checks for LINK_PYQT_SKIP, allowing pytest env names like
`py36` to work properly without negative conditionals in tox.ini
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -13,6 +13,7 @@ skipsdist = true setenv = QT_QPA_PLATFORM_PLUGIN_PATH={envdir}/Lib/site-packages/PyQt5/plugins/platforms PYTEST_QT_API=pyqt5 + pyqt{,56,571,58,59}: LINK_PYQT_SKIP=true pyqt{,56,571,58,59}: 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 @@ -27,7 +28,7 @@ deps = pyqt58: PyQt5==5.8.2 pyqt59: PyQt5==5.9.2 commands = - pyqtlink: {envpython} scripts/link_pyqt.py --tox {envdir} + {envpython} scripts/link_pyqt.py --tox {envdir} {envpython} -bb -m pytest {posargs:tests} cov: {envpython} scripts/dev/check_coverage.py {posargs} |