summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2020-01-09 21:14:41 +0100
committerFlorian Bruhin <me@the-compiler.org>2020-01-10 17:06:20 +0100
commit30fdde8a450f72d40ded7db323fb99f4a066cec3 (patch)
tree2263c5ba88e4808b6491529eb5c1a25a495c955b /tox.ini
parent7dfb403478d7a1f27ffcd50263f1e9a43298a0dd (diff)
downloadqutebrowser-30fdde8a450f72d40ded7db323fb99f4a066cec3.tar.gz
qutebrowser-30fdde8a450f72d40ded7db323fb99f4a066cec3.zip
Replace tox -e mkvenv by a mkvenv.py script
This was mainly needed because PyQt 5.14.1 is a manylinux2014 wheel and needs an updated pip, see #5013
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini10
1 files changed, 2 insertions, 8 deletions
diff --git a/tox.ini b/tox.ini
index c4c9d1a60..f2bd60f0a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -43,29 +43,23 @@ commands =
[testenv:mkvenv]
basepython = {env:PYTHON:python3}
-commands = {envpython} scripts/link_pyqt.py --tox {envdir}
-envdir = {toxinidir}/.venv
+commands = {envpython} scripts/mkvenv.py --tox-error --pyqt-type link
usedevelop = true
deps =
- -r{toxinidir}/requirements.txt
# This is undocumented, but it's a common typo, so let's make it work
[testenv:mkenv]
basepython = {[testenv:mkvenv]basepython}
commands = {[testenv:mkvenv]commands}
-envdir = {[testenv:mkvenv]envdir}
usedevelop = {[testenv:mkvenv]usedevelop}
deps = {[testenv:mkvenv]deps}
# Virtualenv with PyQt5 from PyPI
[testenv:mkvenv-pypi]
basepython = {env:PYTHON:python3}
-envdir = {toxinidir}/.venv
-commands = {envpython} -c ""
+commands = {envpython} scripts/mkvenv.py --tox-error
usedevelop = true
deps =
- -r{toxinidir}/requirements.txt
- -r{toxinidir}/misc/requirements/requirements-pyqt-5.12.txt
[testenv:misc]
ignore_errors = true