summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2018-10-03 16:07:38 +0200
committerFlorian Bruhin <me@the-compiler.org>2018-10-04 16:57:37 +0200
commit46730720c0a0574e81ebc030920d90f49bb0418c (patch)
treea414f14f16338cc16265babc4792ea1b8e9833a8
parent7e7d18f113eefbd1f619eef39339c11d25306971 (diff)
downloadqutebrowser-46730720c0a0574e81ebc030920d90f49bb0418c.tar.gz
qutebrowser-46730720c0a0574e81ebc030920d90f49bb0418c.zip
Upgrade PyQt and pytest-qt for v1.5.0
(cherry picked from commit 7d08714a93ade6ba9c6d9b17490c1ce95dfa758e) (cherry picked from commit cfffc628f3c3416391903f5dd57b0519172cccaa) (cherry picked from commit c472adfa82fc2143cca831af5cb5127c34b73397)
-rw-r--r--doc/changelog.asciidoc3
-rw-r--r--misc/requirements/requirements-pyqt.txt4
-rw-r--r--misc/requirements/requirements-tests.txt2
-rw-r--r--tox.ini2
4 files changed, 7 insertions, 4 deletions
diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index d9c95a8fa..906ff30bc 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -49,6 +49,9 @@ Added
Changed
~~~~~~~
+- Windows and macOS releases now bundle Python 3.7, PyQt 5.11.3 and Qt 5.11.2.
+ QtWebEngine includes security fixes up to Chromium 68.0.3440.75 and
+ http://code.qt.io/cgit/qt/qtwebengine.git/tree/dist/changes-5.11.2/?h=v5.11.2[various other fixes].
- Various performance improvements when many tabs are opened.
- The `content.headers.referer` setting now works on QtWebEngine.
- The `:repeat` command now takes a count which is multiplied with the given
diff --git a/misc/requirements/requirements-pyqt.txt b/misc/requirements/requirements-pyqt.txt
index 2878a55f8..32aee87a9 100644
--- a/misc/requirements/requirements-pyqt.txt
+++ b/misc/requirements/requirements-pyqt.txt
@@ -1,4 +1,4 @@
# This file is automatically generated by scripts/dev/recompile_requirements.py
-PyQt5==5.11.2
-PyQt5-sip==4.19.12
+PyQt5==5.11.3
+PyQt5-sip==4.19.13
diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index baf129818..7c7158433 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -31,7 +31,7 @@ pytest-cov==2.6.0
pytest-faulthandler==1.5.0
pytest-instafail==0.4.0
pytest-mock==1.10.0
-pytest-qt==3.2.0
+pytest-qt==3.2.1
pytest-repeat==0.7.0
pytest-rerunfailures==4.1
pytest-travis-fold==1.3.0
diff --git a/tox.ini b/tox.ini
index 37451918c..e5cb563ac 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,7 +28,7 @@ deps =
pyqt571: PyQt5==5.7.1
pyqt59: PyQt5==5.9.2
pyqt510: PyQt5==5.10.1
- pyqt511: PyQt5==5.11.2
+ pyqt511: PyQt5==5.11.3
commands =
{envpython} scripts/link_pyqt.py --tox {envdir}
{envpython} -bb -m pytest {posargs:tests}