From 30fdde8a450f72d40ded7db323fb99f4a066cec3 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Thu, 9 Jan 2020 21:14:41 +0100
Subject: 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
---
 tox.ini | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'tox.ini')

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
-- 
cgit v1.2.3-54-g00ecf