Use separate requirements files for different Qt versions

14 files changed, 52 insertions, 14 deletions

diff --git a/.travis.yml b/.travis.yml
index 243294d92..e30ede6e0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,10 +17,10 @@ matrix:
 
     ### PyQt 5.7.1 (Python 3.5)
     - python: 3.5
-      env: TESTENV=py35-pyqt571
+      env: TESTENV=py35-pyqt57
     ### PyQt 5.7.1 (Python 3.6)
     - python: 3.6
-      env: TESTENV=py36-pyqt571
+      env: TESTENV=py36-pyqt57
 
     ### PyQt 5.9
     - env: TESTENV=py37-pyqt59
diff --git a/misc/requirements/requirements-pyqt-5.10.txt b/misc/requirements/requirements-pyqt-5.10.txt
new file mode 100644
index 000000000..549df8f39
--- /dev/null
+++ b/misc/requirements/requirements-pyqt-5.10.txt
@@ -0,0 +1,4 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+PyQt5==5.9.2  # rq.filter: < 5.10
+sip==4.19.8
diff --git a/misc/requirements/requirements-pyqt-5.10.txt-raw b/misc/requirements/requirements-pyqt-5.10.txt-raw
new file mode 100644
index 000000000..f30dcda63
--- /dev/null
+++ b/misc/requirements/requirements-pyqt-5.10.txt-raw
@@ -0,0 +1,2 @@
+#@ filter: PyQt5 < 5.10
+PyQt5 >= 5.9, < 5.10
diff --git a/misc/requirements/requirements-pyqt-5.11.txt b/misc/requirements/requirements-pyqt-5.11.txt
new file mode 100644
index 000000000..4124de41f
--- /dev/null
+++ b/misc/requirements/requirements-pyqt-5.11.txt
@@ -0,0 +1,4 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+PyQt5==5.11.3  # rq.filter: < 5.12
+PyQt5-sip==4.19.18
diff --git a/misc/requirements/requirements-pyqt-5.11.txt-raw b/misc/requirements/requirements-pyqt-5.11.txt-raw
new file mode 100644
index 000000000..40a81f952
--- /dev/null
+++ b/misc/requirements/requirements-pyqt-5.11.txt-raw
@@ -0,0 +1,2 @@
+#@ filter: PyQt5 < 5.12
+PyQt5 >= 5.11, < 5.12
diff --git a/misc/requirements/requirements-pyqt-5.12.txt b/misc/requirements/requirements-pyqt-5.12.txt
new file mode 100644
index 000000000..bdb8ffbf3
--- /dev/null
+++ b/misc/requirements/requirements-pyqt-5.12.txt
@@ -0,0 +1,5 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+PyQt5==5.12.3  # rq.filter: < 5.13
+PyQt5-sip==4.19.18
+PyQtWebEngine==5.12.1  # rq.filter: < 5.13
diff --git a/misc/requirements/requirements-pyqt-5.12.txt-raw b/misc/requirements/requirements-pyqt-5.12.txt-raw
new file mode 100644
index 000000000..f127ba42f
--- /dev/null
+++ b/misc/requirements/requirements-pyqt-5.12.txt-raw
@@ -0,0 +1,4 @@
+#@ filter: PyQt5 < 5.13
+#@ filter: PyQtWebEngine < 5.13
+PyQt5 >= 5.12, < 5.13
+PyQtWebEngine >= 5.12, < 5.13
diff --git a/misc/requirements/requirements-pyqt-5.13.txt b/misc/requirements/requirements-pyqt-5.13.txt
new file mode 100644
index 000000000..5a23d8f1f
--- /dev/null
+++ b/misc/requirements/requirements-pyqt-5.13.txt
@@ -0,0 +1,5 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+PyQt5==5.13.0  # rq.filter: < 5.14
+PyQt5-sip==4.19.18
+PyQtWebEngine==5.13.0  # rq.filter: < 5.14
diff --git a/misc/requirements/requirements-pyqt-5.13.txt-raw b/misc/requirements/requirements-pyqt-5.13.txt-raw
new file mode 100644
index 000000000..e60db7edb
--- /dev/null
+++ b/misc/requirements/requirements-pyqt-5.13.txt-raw
@@ -0,0 +1,4 @@
+#@ filter: PyQt5 < 5.14
+#@ filter: PyQtWebEngine < 5.14
+PyQt5 >= 5.13, < 5.14
+PyQtWebEngine >= 5.13, < 5.14
diff --git a/misc/requirements/requirements-pyqt-5.7.txt b/misc/requirements/requirements-pyqt-5.7.txt
new file mode 100644
index 000000000..c3c24c208
--- /dev/null
+++ b/misc/requirements/requirements-pyqt-5.7.txt
@@ -0,0 +1,4 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+PyQt5==5.7.1  # rq.filter: < 5.8
+sip==4.19.8
diff --git a/misc/requirements/requirements-pyqt-5.7.txt-raw b/misc/requirements/requirements-pyqt-5.7.txt-raw
new file mode 100644
index 000000000..5127ce517
--- /dev/null
+++ b/misc/requirements/requirements-pyqt-5.7.txt-raw
@@ -0,0 +1,2 @@
+#@ filter: PyQt5 < 5.8
+PyQt5 >= 5.7, < 5.8
diff --git a/misc/requirements/requirements-pyqt-5.9.txt b/misc/requirements/requirements-pyqt-5.9.txt
new file mode 100644
index 000000000..0345d3244
--- /dev/null
+++ b/misc/requirements/requirements-pyqt-5.9.txt
@@ -0,0 +1,4 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+PyQt5==5.8.2  # rq.filter: < 5.9
+sip==4.19.8
diff --git a/misc/requirements/requirements-pyqt-5.9.txt-raw b/misc/requirements/requirements-pyqt-5.9.txt-raw
new file mode 100644
index 000000000..9445bd7e1
--- /dev/null
+++ b/misc/requirements/requirements-pyqt-5.9.txt-raw
@@ -0,0 +1,2 @@
+#@ filter: PyQt5 < 5.9
+PyQt5 >= 5.8, < 5.9
diff --git a/tox.ini b/tox.ini
index 74cbe6d1b..6ab1bfbf3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,8 +13,8 @@ skipsdist = true
 setenv =
     QT_QPA_PLATFORM_PLUGIN_PATH={envdir}/Lib/site-packages/PyQt5/plugins/platforms
     PYTEST_QT_API=pyqt5
-    pyqt{,56,571,59,510,511,512,513}: LINK_PYQT_SKIP=true
-    pyqt{,56,571,59,510,511,512,513}: QUTE_BDD_WEBENGINE=true
+    pyqt{,57,59,510,511,512,513}: LINK_PYQT_SKIP=true
+    pyqt{,57,59,510,511,512,513}: 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
 basepython =
@@ -25,16 +25,12 @@ deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/misc/requirements/requirements-tests.txt
     pyqt: -r{toxinidir}/misc/requirements/requirements-pyqt.txt
-    pyqt571: PyQt5==5.7.1
-    pyqt59: PyQt5==5.9.2
-    pyqt510: PyQt5==5.10.1
-    pyqt511: PyQt5==5.11.3
-    #
-    pyqt512: PyQt5==5.12.3
-    pyqt512: PyQtWebEngine==5.12.1
-    #
-    pyqt513: PyQt5==5.13.0
-    pyqt513: PyQtWebEngine==5.13.0
+    pyqt57: -r{toxinidir}/misc/requirements/requirements-pyqt-5.7.txt
+    pyqt59: -r{toxinidir}/misc/requirements/requirements-pyqt-5.9.txt
+    pyqt510: -r{toxinidir}/misc/requirements/requirements-pyqt-5.10.txt
+    pyqt511: -r{toxinidir}/misc/requirements/requirements-pyqt-5.11.txt
+    pyqt512: -r{toxinidir}/misc/requirements/requirements-pyqt-5.12.txt
+    pyqt513: -r{toxinidir}/misc/requirements/requirements-pyqt-5.13.txt
 commands =
     {envpython} scripts/link_pyqt.py --tox {envdir}
     {envpython} -bb -m pytest {posargs:tests}