Update to PyQt 5.13

5 files changed, 23 insertions, 11 deletions

diff --git a/.appveyor.yml b/.appveyor.yml
index c42726fbe..42f36c467 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -7,7 +7,7 @@ environment:
     PYTHONUNBUFFERED: 1
     PYTHON: C:\Python37-x64\python.exe
     matrix:
-    - TESTENV: py37-pyqt512
+    - TESTENV: py37-pyqt513
     # - TESTENV: pylint
 
 install:
diff --git a/.travis.yml b/.travis.yml
index f0959d2a6..243294d92 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,8 +35,16 @@ matrix:
     ### PyQt 5.11
     - env: TESTENV=py37-pyqt511
 
-    ### PyQt 5.12 (Python 3.7, with coverage)
-    - env: TESTENV=py37-pyqt512-cov
+    ### PyQt 5.12
+    - env: TESTENV=py37-pyqt512
+      # http://code.qt.io/cgit/qt/qtbase.git/commit/?id=c3a963da1f9e7b1d37e63eedded61da4fbdaaf9a
+      addons:
+        apt:
+          packages:
+          - libxkbcommon-x11-0
+
+    ### PyQt 5.13 (Python 3.7, with coverage)
+    - env: TESTENV=py37-pyqt513-cov
       # http://code.qt.io/cgit/qt/qtbase.git/commit/?id=c3a963da1f9e7b1d37e63eedded61da4fbdaaf9a
       addons:
         apt:
@@ -45,7 +53,7 @@ matrix:
 
     ### macOS sierra
     - os: osx
-      env: TESTENV=py37-pyqt512 OSX=sierra
+      env: TESTENV=py37-pyqt513 OSX=sierra
       osx_image: xcode9.2
       language: generic
     ### macOS yosemite
diff --git a/README.asciidoc b/README.asciidoc
index d05f0b55c..b7fe30466 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -97,7 +97,7 @@ Requirements
 The following software and libraries are required to run qutebrowser:
 
 * https://www.python.org/[Python] 3.5 or newer (3.6 recommended)
-* https://www.qt.io/[Qt] 5.7.1 or newer (5.12 recommended, support for < 5.9
+* https://www.qt.io/[Qt] 5.7.1 or newer (5.13 recommended, support for < 5.9
   will be dropped soon) with the following modules:
   - QtCore / qtbase
   - QtQuick (part of qtbase in some distributions)
@@ -108,7 +108,7 @@ The following software and libraries are required to run qutebrowser:
     only the link:https://github.com/annulen/webkit/wiki[updated fork] (5.212)
     is supported
 * https://www.riverbankcomputing.com/software/pyqt/intro[PyQt] 5.7.0 or newer
-  (5.12 recommended, support for < 5.9 will be dropped soon) for Python 3
+  (5.13 recommended, support for < 5.9 will be dropped soon) for Python 3
 * https://pypi.python.org/pypi/setuptools/[pkg_resources/setuptools]
 * https://fdik.org/pyPEG/[pyPEG2]
 * http://jinja.pocoo.org/[jinja2]
diff --git a/misc/requirements/requirements-pyqt.txt b/misc/requirements/requirements-pyqt.txt
index 610d6c749..be65f9815 100644
--- a/misc/requirements/requirements-pyqt.txt
+++ b/misc/requirements/requirements-pyqt.txt
@@ -1,5 +1,5 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-PyQt5==5.12.3
-PyQt5-sip==4.19.17
+PyQt5==5.13.0
+PyQt5-sip==4.19.18
 PyQtWebEngine==5.12.1
diff --git a/tox.ini b/tox.ini
index 0cdf41573..ebd63e4d7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py37-pyqt512-cov,misc,vulture,flake8,pylint,pyroma,check-manifest,eslint
+envlist = py37-pyqt513-cov,misc,vulture,flake8,pylint,pyroma,check-manifest,eslint
 distshare = {toxworkdir}
 skipsdist = true
 
@@ -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}: LINK_PYQT_SKIP=true
-    pyqt{,56,571,59,510,511,512}: QUTE_BDD_WEBENGINE=true
+    pyqt{,56,571,59,510,511,512,513}: LINK_PYQT_SKIP=true
+    pyqt{,56,571,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 =
@@ -29,8 +29,12 @@ deps =
     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
 commands =
     {envpython} scripts/link_pyqt.py --tox {envdir}
     {envpython} -bb -m pytest {posargs:tests}