Update for PyQt 5.11

This commit is contained in:
Florian Bruhin 2018-06-23 14:32:57 +02:00
parent e857400c2c
commit f7ae7e7d40
8 changed files with 12 additions and 26 deletions

View File

@ -7,7 +7,7 @@ environment:
PYTHONUNBUFFERED: 1 PYTHONUNBUFFERED: 1
PYTHON: C:\Python36\python.exe PYTHON: C:\Python36\python.exe
matrix: matrix:
- TESTENV: py36-pyqt510 - TESTENV: py36-pyqt511
- TESTENV: pylint - TESTENV: pylint
install: install:

View File

@ -20,16 +20,9 @@ matrix:
- os: linux - os: linux
env: TESTENV=py36-pyqt59 env: TESTENV=py36-pyqt59
- os: linux - os: linux
env: TESTENV=py36-pyqt510-cov env: TESTENV=py36-pyqt510
# We need a newer Xvfb as a WORKAROUND for: - os: linux
# https://bugreports.qt.io/browse/QTBUG-64928 env: TESTENV=py36-pyqt511-cov
sudo: required
addons:
apt:
sources:
- sourceline: "deb http://us.archive.ubuntu.com/ubuntu/ xenial main universe"
packages:
- xvfb
- os: osx - os: osx
env: TESTENV=py36 OSX=sierra env: TESTENV=py36 OSX=sierra
osx_image: xcode9.2 osx_image: xcode9.2

View File

@ -97,7 +97,7 @@ Requirements
The following software and libraries are required to run qutebrowser: The following software and libraries are required to run qutebrowser:
* http://www.python.org/[Python] 3.5 or newer (3.6 recommended) * 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 - QtCore / qtbase
- QtQuick (part of qtbase in some distributions) - QtQuick (part of qtbase in some distributions)
- QtSQL (part of qtbase in some distributions) - QtSQL (part of qtbase in some distributions)
@ -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 link:https://github.com/annulen/webkit/wiki[updated fork] (5.212) is
supported supported
* http://www.riverbankcomputing.com/software/pyqt/intro[PyQt] 5.7.0 or newer * 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] * https://pypi.python.org/pypi/setuptools/[pkg_resources/setuptools]
* http://fdik.org/pyPEG/[pyPEG2] * http://fdik.org/pyPEG/[pyPEG2]
* http://jinja.pocoo.org/[jinja2] * http://jinja.pocoo.org/[jinja2]

View File

@ -689,8 +689,6 @@ New PyQt release
~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~
* See above. * 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. * Update `tox.ini`/`.travis.yml`/`.appveyor.yml` to test new versions.
qutebrowser release qutebrowser release

View File

@ -1,4 +0,0 @@
# This file is automatically generated by scripts/dev/recompile_requirements.py
PyQt5==5.10 # rq.filter: != 5.10.1
sip==4.19.8

View File

@ -1,2 +0,0 @@
PyQt5==5.10.0
#@ filter: PyQt5 != 5.10.1

View File

@ -1,4 +1,4 @@
# This file is automatically generated by scripts/dev/recompile_requirements.py # This file is automatically generated by scripts/dev/recompile_requirements.py
PyQt5==5.10.1 PyQt5==5.11.2
sip==4.19.8 PyQt5-sip==4.19.11

View File

@ -13,8 +13,8 @@ skipsdist = true
setenv = setenv =
QT_QPA_PLATFORM_PLUGIN_PATH={envdir}/Lib/site-packages/PyQt5/plugins/platforms QT_QPA_PLATFORM_PLUGIN_PATH={envdir}/Lib/site-packages/PyQt5/plugins/platforms
PYTEST_QT_API=pyqt5 PYTEST_QT_API=pyqt5
pyqt{,56,571,59,510}: LINK_PYQT_SKIP=true pyqt{,56,571,59,510,511}: LINK_PYQT_SKIP=true
pyqt{,56,571,59,510}: QUTE_BDD_WEBENGINE=true pyqt{,56,571,59,510,511}: QUTE_BDD_WEBENGINE=true
cov: PYTEST_ADDOPTS=--cov --cov-report xml --cov-report=html --cov-report= cov: PYTEST_ADDOPTS=--cov --cov-report xml --cov-report=html --cov-report=
passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI TRAVIS XDG_* QUTE_* DOCKER passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI TRAVIS XDG_* QUTE_* DOCKER
basepython = basepython =
@ -28,6 +28,7 @@ deps =
pyqt571: PyQt5==5.7.1 pyqt571: PyQt5==5.7.1
pyqt59: PyQt5==5.9.2 pyqt59: PyQt5==5.9.2
pyqt510: PyQt5==5.10.1 pyqt510: PyQt5==5.10.1
pyqt511: PyQt5==5.11.2
commands = commands =
{envpython} scripts/link_pyqt.py --tox {envdir} {envpython} scripts/link_pyqt.py --tox {envdir}
{envpython} -bb -m pytest {posargs:tests} {envpython} -bb -m pytest {posargs:tests}
@ -59,7 +60,7 @@ commands = {envpython} -c ""
usedevelop = true usedevelop = true
deps = deps =
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/misc/requirements/requirements-pyqt-old.txt -r{toxinidir}/misc/requirements/requirements-pyqt.txt
[testenv:misc] [testenv:misc]
ignore_errors = true ignore_errors = true