diff options
-rw-r--r-- | .github/workflows/ci.yml | 20 | ||||
-rw-r--r-- | .travis.yml | 16 | ||||
-rw-r--r-- | misc/requirements/requirements-pyqt-5.10.txt | 4 | ||||
-rw-r--r-- | misc/requirements/requirements-pyqt-5.10.txt-raw | 4 | ||||
-rw-r--r-- | misc/requirements/requirements-pyqt-5.11.txt | 4 | ||||
-rw-r--r-- | misc/requirements/requirements-pyqt-5.11.txt-raw | 4 | ||||
-rw-r--r-- | misc/requirements/requirements-pyqt-5.7.txt | 4 | ||||
-rw-r--r-- | misc/requirements/requirements-pyqt-5.7.txt-raw | 4 | ||||
-rw-r--r-- | misc/requirements/requirements-pyqt-5.9.txt | 4 | ||||
-rw-r--r-- | misc/requirements/requirements-pyqt-5.9.txt-raw | 4 | ||||
-rw-r--r-- | tox.ini | 8 |
11 files changed, 6 insertions, 70 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 182f935be..58ebc1f3f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,26 +100,14 @@ jobs: fail-fast: false matrix: include: - ### PyQt 5.9 (Python 3.6) - - testenv: py36-pyqt59 - os: ubuntu-18.04 - python: 3.6 - ### PyQt 5.10 (Python 3.6) - - testenv: py36-pyqt510 + ### PyQt 5.12 (Python 3.6) + - testenv: py36-pyqt512 os: ubuntu-20.04 python: 3.6 - ### PyQt 5.11 (Python 3.7) - - testenv: py37-pyqt511 + ### PyQt 5.13 (Python 3.7) + - testenv: py37-pyqt513 os: ubuntu-20.04 python: 3.7 - ### PyQt 5.12 (Python 3.8) - - testenv: py38-pyqt512 - os: ubuntu-20.04 - python: 3.8 - ### PyQt 5.13 (Python 3.8) - - testenv: py38-pyqt513 - os: ubuntu-20.04 - python: 3.8 ### PyQt 5.14 (Python 3.8) - testenv: py38-pyqt514 os: ubuntu-20.04 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index b75081477..000000000 --- a/.travis.yml +++ /dev/null @@ -1,16 +0,0 @@ -dist: xenial -language: python -python: 3.6 -os: linux -env: TESTENV=py36-pyqt57 - -install: - - python -m pip install -U pip - - python -m pip install -U -r misc/requirements/requirements-tox.txt - - ulimit -c unlimited - -script: - - tox -e "$TESTENV" - -after_failure: - - bash scripts/dev/ci/backtrace.sh diff --git a/misc/requirements/requirements-pyqt-5.10.txt b/misc/requirements/requirements-pyqt-5.10.txt deleted file mode 100644 index 69c3ccbd0..000000000 --- a/misc/requirements/requirements-pyqt-5.10.txt +++ /dev/null @@ -1,4 +0,0 @@ -# This file is automatically generated by scripts/dev/recompile_requirements.py - -PyQt5==5.10.1 # rq.filter: < 5.11 -sip==4.19.8 # rq.filter: < 5 diff --git a/misc/requirements/requirements-pyqt-5.10.txt-raw b/misc/requirements/requirements-pyqt-5.10.txt-raw deleted file mode 100644 index 4fbea8575..000000000 --- a/misc/requirements/requirements-pyqt-5.10.txt-raw +++ /dev/null @@ -1,4 +0,0 @@ -#@ filter: PyQt5 < 5.11 -PyQt5 >= 5.10, < 5.11 -#@ filter: sip < 5 -sip < 5 diff --git a/misc/requirements/requirements-pyqt-5.11.txt b/misc/requirements/requirements-pyqt-5.11.txt deleted file mode 100644 index bfee87c0f..000000000 --- a/misc/requirements/requirements-pyqt-5.11.txt +++ /dev/null @@ -1,4 +0,0 @@ -# This file is automatically generated by scripts/dev/recompile_requirements.py - -PyQt5==5.11.3 # rq.filter: < 5.12 -PyQt5-sip==4.19.19 # rq.filter: < 4.20 diff --git a/misc/requirements/requirements-pyqt-5.11.txt-raw b/misc/requirements/requirements-pyqt-5.11.txt-raw deleted file mode 100644 index bdbe43f19..000000000 --- a/misc/requirements/requirements-pyqt-5.11.txt-raw +++ /dev/null @@ -1,4 +0,0 @@ -#@ filter: PyQt5 < 5.12 -PyQt5 >= 5.11, < 5.12 - -#@ filter: PyQt5-sip < 4.20 diff --git a/misc/requirements/requirements-pyqt-5.7.txt b/misc/requirements/requirements-pyqt-5.7.txt deleted file mode 100644 index 703c95a92..000000000 --- a/misc/requirements/requirements-pyqt-5.7.txt +++ /dev/null @@ -1,4 +0,0 @@ -# This file is automatically generated by scripts/dev/recompile_requirements.py - -PyQt5==5.7.1 # rq.filter: < 5.8 -sip==4.19.8 # rq.filter: < 5 diff --git a/misc/requirements/requirements-pyqt-5.7.txt-raw b/misc/requirements/requirements-pyqt-5.7.txt-raw deleted file mode 100644 index 745deb4b9..000000000 --- a/misc/requirements/requirements-pyqt-5.7.txt-raw +++ /dev/null @@ -1,4 +0,0 @@ -#@ filter: PyQt5 < 5.8 -#@ filter: sip < 5 -PyQt5 >= 5.7, < 5.8 -sip < 5 diff --git a/misc/requirements/requirements-pyqt-5.9.txt b/misc/requirements/requirements-pyqt-5.9.txt deleted file mode 100644 index 8f3258721..000000000 --- a/misc/requirements/requirements-pyqt-5.9.txt +++ /dev/null @@ -1,4 +0,0 @@ -# This file is automatically generated by scripts/dev/recompile_requirements.py - -PyQt5==5.9.2 # rq.filter: < 5.10 -sip==4.19.8 # rq.filter: < 5 diff --git a/misc/requirements/requirements-pyqt-5.9.txt-raw b/misc/requirements/requirements-pyqt-5.9.txt-raw deleted file mode 100644 index 45d4e0c10..000000000 --- a/misc/requirements/requirements-pyqt-5.9.txt-raw +++ /dev/null @@ -1,4 +0,0 @@ -#@ filter: PyQt5 < 5.10 -PyQt5 >= 5.9, < 5.10 -#@ filter: sip < 5 -sip < 5 @@ -12,8 +12,8 @@ minversion = 3.15 [testenv] setenv = PYTEST_QT_API=pyqt5 - pyqt{,57,59,510,511,512,513,514,515}: LINK_PYQT_SKIP=true - pyqt{,57,59,510,511,512,513,514,515}: QUTE_BDD_WEBENGINE=true + pyqt{,512,513,514,515}: LINK_PYQT_SKIP=true + pyqt{,512,513,514,515}: QUTE_BDD_WEBENGINE=true cov: PYTEST_ADDOPTS=--cov --cov-report xml --cov-report=html --cov-report= passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI XDG_* QUTE_* DOCKER QT_QUICK_BACKEND PY_COLORS basepython = @@ -27,10 +27,6 @@ deps = -r{toxinidir}/requirements.txt -r{toxinidir}/misc/requirements/requirements-tests.txt pyqt: -r{toxinidir}/misc/requirements/requirements-pyqt.txt - pyqt57: -r{toxinidir}/misc/requirements/requirements-pyqt-5.7.txt - pyqt59: -r{toxinidir}/misc/requirements/requirements-pyqt-5.9.txt - pyqt510: -r{toxinidir}/misc/requirements/requirements-pyqt-5.10.txt - pyqt511: -r{toxinidir}/misc/requirements/requirements-pyqt-5.11.txt pyqt512: -r{toxinidir}/misc/requirements/requirements-pyqt-5.12.txt pyqt513: -r{toxinidir}/misc/requirements/requirements-pyqt-5.13.txt pyqt514: -r{toxinidir}/misc/requirements/requirements-pyqt-5.14.txt |