From e26e04985b68c56cc9946e020b79747ea14e7ec8 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 23 Jan 2018 20:36:31 +0100 Subject: [PATCH] Revert "Update to PyQt 5.10" This reverts commit a701426703c1a7354b8c8ac77e2ee4c020697632. --- .travis.yml | 6 ++---- misc/requirements/requirements-pyqt.txt | 4 ++-- tox.ini | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index a38ec0fe4..251842d06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,12 +17,10 @@ matrix: - os: linux env: TESTENV=py36-pyqt58 - os: linux + python: 3.5 env: TESTENV=py35-pyqt59 - os: linux - python: 3.5 - env: TESTENV=py35-pyqt510 - - os: linux - env: TESTENV=py36-pyqt510-cov + env: TESTENV=py36-pyqt59-cov - os: osx env: TESTENV=py36 OSX=sierra osx_image: xcode9.2 diff --git a/misc/requirements/requirements-pyqt.txt b/misc/requirements/requirements-pyqt.txt index 99ba1b7cc..5a08f2f73 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.10 -sip==4.19.7 +PyQt5==5.9.2 +sip==4.19.6 diff --git a/tox.ini b/tox.ini index db020f4a4..5b8bc05b5 100644 --- a/tox.ini +++ b/tox.ini @@ -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,58,59,510}: LINK_PYQT_SKIP=true - pyqt{,56,571,58,59,510}: QUTE_BDD_WEBENGINE=true + pyqt{,56,571,58,59}: LINK_PYQT_SKIP=true + pyqt{,56,571,58,59}: 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 = @@ -27,7 +27,6 @@ deps = pyqt571: PyQt5==5.7.1 pyqt58: PyQt5==5.8.2 pyqt59: PyQt5==5.9.2 - pyqt510: PyQt5==5.10 commands = {envpython} scripts/link_pyqt.py --tox {envdir} {envpython} -bb -m pytest {posargs:tests}