Skip to content

Commit

Permalink
Update for PyQt 5.11
Browse files Browse the repository at this point in the history
  • Loading branch information
The-Compiler committed Jul 2, 2018
1 parent e857400 commit f7ae7e7
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Expand Up @@ -7,7 +7,7 @@ environment:
PYTHONUNBUFFERED: 1
PYTHON: C:\Python36\python.exe
matrix:
- TESTENV: py36-pyqt510
- TESTENV: py36-pyqt511
- TESTENV: pylint

install:
Expand Down
13 changes: 3 additions & 10 deletions .travis.yml
Expand Up @@ -20,16 +20,9 @@ matrix:
- os: linux
env: TESTENV=py36-pyqt59
- os: linux
env: TESTENV=py36-pyqt510-cov
# We need a newer Xvfb as a WORKAROUND for:
# https://bugreports.qt.io/browse/QTBUG-64928
sudo: required
addons:
apt:
sources:
- sourceline: "deb http://us.archive.ubuntu.com/ubuntu/ xenial main universe"
packages:
- xvfb
env: TESTENV=py36-pyqt510
- os: linux
env: TESTENV=py36-pyqt511-cov
- os: osx
env: TESTENV=py36 OSX=sierra
osx_image: xcode9.2
Expand Down
4 changes: 2 additions & 2 deletions README.asciidoc
Expand Up @@ -97,7 +97,7 @@ Requirements
The following software and libraries are required to run qutebrowser:

* http://www.python.org/[Python] 3.5 or newer (3.6 recommended)
* http://qt.io/[Qt] 5.7.1 or newer (5.10 recommended) with the following modules:
* http://qt.io/[Qt] 5.7.1 or newer (5.11.1 recommended) with the following modules:
- QtCore / qtbase
- QtQuick (part of qtbase in some distributions)
- QtSQL (part of qtbase in some distributions)
Expand All @@ -107,7 +107,7 @@ The following software and libraries are required to run qutebrowser:
link:https://github.com/annulen/webkit/wiki[updated fork] (5.212) is
supported
* http://www.riverbankcomputing.com/software/pyqt/intro[PyQt] 5.7.0 or newer
(5.10 recommended) for Python 3
(5.11.2 recommended) for Python 3
* https://pypi.python.org/pypi/setuptools/[pkg_resources/setuptools]
* http://fdik.org/pyPEG/[pyPEG2]
* http://jinja.pocoo.org/[jinja2]
Expand Down
2 changes: 0 additions & 2 deletions doc/contributing.asciidoc
Expand Up @@ -689,8 +689,6 @@ New PyQt release
~~~~~~~~~~~~~~~~

* See above.
* Install new PyQt in Windows VM (32- and 64-bit).
* Download new installer and update PyQt installer path in `ci_install.py`.
* Update `tox.ini`/`.travis.yml`/`.appveyor.yml` to test new versions.
qutebrowser release
Expand Down
4 changes: 0 additions & 4 deletions misc/requirements/requirements-pyqt-old.txt

This file was deleted.

2 changes: 0 additions & 2 deletions misc/requirements/requirements-pyqt-old.txt-raw

This file was deleted.

4 changes: 2 additions & 2 deletions misc/requirements/requirements-pyqt.txt
@@ -1,4 +1,4 @@
# This file is automatically generated by scripts/dev/recompile_requirements.py

PyQt5==5.10.1
sip==4.19.8
PyQt5==5.11.2
PyQt5-sip==4.19.11
7 changes: 4 additions & 3 deletions tox.ini
Expand Up @@ -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}: LINK_PYQT_SKIP=true
pyqt{,56,571,59,510}: QUTE_BDD_WEBENGINE=true
pyqt{,56,571,59,510,511}: LINK_PYQT_SKIP=true
pyqt{,56,571,59,510,511}: 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
basepython =
Expand All @@ -28,6 +28,7 @@ deps =
pyqt571: PyQt5==5.7.1
pyqt59: PyQt5==5.9.2
pyqt510: PyQt5==5.10.1
pyqt511: PyQt5==5.11.2
commands =
{envpython} scripts/link_pyqt.py --tox {envdir}
{envpython} -bb -m pytest {posargs:tests}
Expand Down Expand Up @@ -59,7 +60,7 @@ commands = {envpython} -c ""
usedevelop = true
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/misc/requirements/requirements-pyqt-old.txt
-r{toxinidir}/misc/requirements/requirements-pyqt.txt

[testenv:misc]
ignore_errors = true
Expand Down

0 comments on commit f7ae7e7

Please sign in to comment.