diff options
| author | Florian Bruhin <git@the-compiler.org> | 2017-07-04 17:30:47 +0200 |
|---|---|---|
| committer | Florian Bruhin <git@the-compiler.org> | 2017-07-04 17:31:09 +0200 |
| commit | 023bf826384d58e259ce38ce430edb87508d176f (patch) | |
| tree | f0cf09de1ec015d0c24188b9077f3f2c285fdbf7 | |
| parent | 45b1285402349e180e8f0a58978ef3148d0d1875 (diff) | |
| download | qutebrowser-023bf826384d58e259ce38ce430edb87508d176f.tar.gz qutebrowser-023bf826384d58e259ce38ce430edb87508d176f.zip | |
Update for PyQt 5.9.1
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | README.asciidoc | 4 | ||||
| -rw-r--r-- | misc/requirements/requirements-pyqt.txt | 4 | ||||
| -rw-r--r-- | tox.ini | 22 |
4 files changed, 32 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index e18bd2efa..ec2868730 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,12 +25,16 @@ matrix: env: TESTENV=py36-pyqt571 - os: linux language: python + python: 3.6 + env: TESTENV=py36-pyqt58 + - os: linux + language: python python: 3.5 - env: TESTENV=py35-pyqt58 + env: TESTENV=py35-pyqt59 - os: linux language: python python: 3.6 - env: TESTENV=py36-pyqt58 + env: TESTENV=py36-pyqt59 - os: osx env: TESTENV=py36 OSX=elcapitan osx_image: xcode7.3 diff --git a/README.asciidoc b/README.asciidoc index 347b8356b..1c7e42c33 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -99,10 +99,10 @@ Requirements The following software and libraries are required to run qutebrowser: * http://www.python.org/[Python] 3.4 or newer (3.5 recommended) -* http://qt.io/[Qt] 5.2.0 or newer (5.9.0 recommended) +* http://qt.io/[Qt] 5.2.0 or newer (5.9 recommended) * QtWebKit (old or link:https://github.com/annulen/webkit/wiki[reloaded]/NG) or QtWebEngine * http://www.riverbankcomputing.com/software/pyqt/intro[PyQt] 5.2.0 or newer -(5.8.1 recommended) for Python 3 +(5.9 recommended) for Python 3 * https://pypi.python.org/pypi/setuptools/[pkg_resources/setuptools] * http://fdik.org/pyPEG/[pyPEG2] * http://jinja.pocoo.org/[jinja2] diff --git a/misc/requirements/requirements-pyqt.txt b/misc/requirements/requirements-pyqt.txt index da611589a..fffa133ab 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.8.2 -sip==4.19.2 +PyQt5==5.9 +sip==4.19.3 @@ -111,6 +111,28 @@ deps = PyQt5==5.8.2 commands = {envpython} -bb -m pytest {posargs:tests} +[testenv:py35-pyqt59] +basepython = python3.5 +setenv = + {[testenv]setenv} + QUTE_BDD_WEBENGINE=true +passenv = {[testenv]passenv} +deps = + {[testenv]deps} + PyQt5==5.9 +commands = {envpython} -bb -m pytest {posargs:tests} + +[testenv:py36-pyqt59] +basepython = {env:PYTHON:python3.6} +setenv = + {[testenv]setenv} + QUTE_BDD_WEBENGINE=true +passenv = {[testenv]passenv} +deps = + {[testenv]deps} + PyQt5==5.9 +commands = {envpython} -bb -m pytest {posargs:tests} + # other envs [testenv:mkvenv] |