parent
184e0ee44e
commit
c964bfb4bf
@ -5,15 +5,15 @@ cache:
|
|||||||
build: off
|
build: off
|
||||||
environment:
|
environment:
|
||||||
PYTHONUNBUFFERED: 1
|
PYTHONUNBUFFERED: 1
|
||||||
PYTHON: C:\Python36-x64\python.exe
|
PYTHON: C:\Python37-x64\python.exe
|
||||||
matrix:
|
matrix:
|
||||||
- TESTENV: py36-pyqt511
|
- TESTENV: py37-pyqt512
|
||||||
- TESTENV: pylint
|
- TESTENV: pylint
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- '%PYTHON% -m pip install -U pip'
|
- '%PYTHON% -m pip install -U pip'
|
||||||
- '%PYTHON% -m pip install -r misc\requirements\requirements-tox.txt'
|
- '%PYTHON% -m pip install -r misc\requirements\requirements-tox.txt'
|
||||||
- 'set PATH=C:\Python36-x64;%PATH'
|
- 'set PATH=C:\Python37-x64;%PATH'
|
||||||
|
|
||||||
test_script:
|
test_script:
|
||||||
- '%PYTHON% -m tox -e %TESTENV%'
|
- '%PYTHON% -m tox -e %TESTENV%'
|
||||||
|
13
.travis.yml
13
.travis.yml
@ -31,14 +31,11 @@ matrix:
|
|||||||
packages:
|
packages:
|
||||||
- xfonts-base
|
- xfonts-base
|
||||||
|
|
||||||
### PyQt 5.11 (with coverage)
|
### PyQt 5.11
|
||||||
- env: TESTENV=py36-pyqt511-cov
|
- env: TESTENV=py36-pyqt511
|
||||||
### PyQt 5.11 (Python 3.7)
|
|
||||||
- python: 3.7
|
|
||||||
env: TESTENV=py37-pyqt511
|
|
||||||
|
|
||||||
### PyQt 5.12
|
### PyQt 5.12 (Python 3.7, with coverage)
|
||||||
- env: TESTENV=py36-pyqt512
|
- env: TESTENV=py37-pyqt512-cov
|
||||||
addons:
|
addons:
|
||||||
apt:
|
apt:
|
||||||
packages:
|
packages:
|
||||||
@ -46,7 +43,7 @@ matrix:
|
|||||||
|
|
||||||
### macOS sierra
|
### macOS sierra
|
||||||
- os: osx
|
- os: osx
|
||||||
env: TESTENV=py37-pyqt511 OSX=sierra
|
env: TESTENV=py37-pyqt512 OSX=sierra
|
||||||
osx_image: xcode9.2
|
osx_image: xcode9.2
|
||||||
language: generic
|
language: generic
|
||||||
### macOS yosemite
|
### macOS yosemite
|
||||||
|
@ -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:
|
||||||
|
|
||||||
* https://www.python.org/[Python] 3.5 or newer (3.6 recommended)
|
* 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:
|
will be dropped soon) with the following modules:
|
||||||
- QtCore / qtbase
|
- QtCore / qtbase
|
||||||
- QtQuick (part of qtbase in some distributions)
|
- 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)
|
only the link:https://github.com/annulen/webkit/wiki[updated fork] (5.212)
|
||||||
is supported
|
is supported
|
||||||
* https://www.riverbankcomputing.com/software/pyqt/intro[PyQt] 5.7.0 or newer
|
* 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://pypi.python.org/pypi/setuptools/[pkg_resources/setuptools]
|
||||||
* https://fdik.org/pyPEG/[pyPEG2]
|
* https://fdik.org/pyPEG/[pyPEG2]
|
||||||
* http://jinja.pocoo.org/[jinja2]
|
* http://jinja.pocoo.org/[jinja2]
|
||||||
|
2
tox.ini
2
tox.ini
@ -4,7 +4,7 @@
|
|||||||
# and then run "tox" from this directory.
|
# and then run "tox" from this directory.
|
||||||
|
|
||||||
[tox]
|
[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}
|
distshare = {toxworkdir}
|
||||||
skipsdist = true
|
skipsdist = true
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user