diff options
| author | Florian Bruhin <me@the-compiler.org> | 2019-02-25 10:36:08 +0100 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2019-02-25 10:36:08 +0100 |
| commit | c964bfb4bfabc4dea92daf59d7d834927b2549c3 (patch) | |
| tree | c9016f55dc27f5350852f15059ba3198c8e38966 | |
| parent | 184e0ee44e74ca99ac72fb2a036f655762ef25b3 (diff) | |
| download | qutebrowser-c964bfb4bfabc4dea92daf59d7d834927b2549c3.tar.gz qutebrowser-c964bfb4bfabc4dea92daf59d7d834927b2549c3.zip | |
Finish Qt 5.12 work
Closes #4591
| -rw-r--r-- | .appveyor.yml | 6 | ||||
| -rw-r--r-- | .travis.yml | 15 | ||||
| -rw-r--r-- | README.asciidoc | 4 | ||||
| -rw-r--r-- | tox.ini | 2 |
4 files changed, 12 insertions, 15 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 92a20c0bd..42baac6c9 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -5,15 +5,15 @@ cache: build: off environment: PYTHONUNBUFFERED: 1 - PYTHON: C:\Python36-x64\python.exe + PYTHON: C:\Python37-x64\python.exe matrix: - - TESTENV: py36-pyqt511 + - TESTENV: py37-pyqt512 - TESTENV: pylint install: - '%PYTHON% -m pip install -U pip' - '%PYTHON% -m pip install -r misc\requirements\requirements-tox.txt' - - 'set PATH=C:\Python36-x64;%PATH' + - 'set PATH=C:\Python37-x64;%PATH' test_script: - '%PYTHON% -m tox -e %TESTENV%' diff --git a/.travis.yml b/.travis.yml index 061810ee8..7545784ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,14 +31,11 @@ matrix: packages: - xfonts-base - ### PyQt 5.11 (with coverage) - - env: TESTENV=py36-pyqt511-cov - ### PyQt 5.11 (Python 3.7) - - python: 3.7 - env: TESTENV=py37-pyqt511 - - ### PyQt 5.12 - - env: TESTENV=py36-pyqt512 + ### PyQt 5.11 + - env: TESTENV=py36-pyqt511 + + ### PyQt 5.12 (Python 3.7, with coverage) + - env: TESTENV=py37-pyqt512-cov addons: apt: packages: @@ -46,7 +43,7 @@ matrix: ### macOS sierra - os: osx - env: TESTENV=py37-pyqt511 OSX=sierra + env: TESTENV=py37-pyqt512 OSX=sierra osx_image: xcode9.2 language: generic ### macOS yosemite diff --git a/README.asciidoc b/README.asciidoc index b2d882eae..334c0561e 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.11 recommended, support for < 5.9 +* https://www.qt.io/[Qt] 5.7.1 or newer (5.12 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.11 recommended, support for < 5.9 will be dropped soon) for Python 3 + (5.12 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] @@ -4,7 +4,7 @@ # and then run "tox" from this directory. [tox] -envlist = py36-pyqt511-cov,misc,vulture,flake8,pylint,pyroma,check-manifest,eslint +envlist = py37-pyqt512-cov,misc,vulture,flake8,pylint,pyroma,check-manifest,eslint distshare = {toxworkdir} skipsdist = true |