diff options
| author | Florian Bruhin <me@the-compiler.org> | 2020-07-31 14:35:59 +0200 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2020-07-31 14:35:59 +0200 |
| commit | 41bcada133b7235db698a2354df27585438b6a4b (patch) | |
| tree | 3a2dd43d321e40ef1f936e61235de325bd620b14 /tox.ini | |
| parent | 1490135cb992fc4874fea8ba4cad7c054243fd31 (diff) | |
| parent | 71ab96eb3ce3242a2863403943ce097230800cce (diff) | |
| download | qutebrowser-41bcada133b7235db698a2354df27585438b6a4b.tar.gz qutebrowser-41bcada133b7235db698a2354df27585438b6a4b.zip | |
Merge branch 'master' into pr/5457
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 25 |
1 files changed, 11 insertions, 14 deletions
@@ -4,9 +4,10 @@ # and then run "tox" from this directory. [tox] -envlist = py37-pyqt515-cov,misc,vulture,flake8,pylint,pyroma,check-manifest,eslint +envlist = py38-pyqt515-cov,mypy,misc,vulture,flake8,pylint,pyroma,check-manifest,eslint,yamllint distshare = {toxworkdir} skipsdist = true +minversion = 3.15 [testenv] setenv = @@ -158,7 +159,7 @@ commands = {envpython} scripts/dev/check_doc_changes.py {posargs} {envpython} scripts/asciidoc2html.py {posargs} -[testenv:pyinstaller] +[testenv:pyinstaller-{64,32}] basepython = {env:PYTHON:python3} pip_version = pip passenv = APPDATA HOME PYINSTALLER_DEBUG @@ -169,17 +170,6 @@ deps = commands = {envbindir}/pyinstaller --noconfirm misc/qutebrowser.spec -[testenv:pyinstaller32] -# A copy of the pyinstaller environment above, to be used for 32-bit on Windows -# to make sure the both installations are separated. -# This doesn't actually do anything 32-bit specific, that part happens by -# setting the PYTHON environment variable accordingly. -basepython = {[testenv:pyinstaller]basepython} -pip_version = {[testenv:pyinstaller]pip_version} -passenv = {[testenv:pyinstaller]passenv} -deps = {[testenv:pyinstaller]deps} -commands = {[testenv:pyinstaller]commands} - [testenv:eslint] basepython = python3 deps = @@ -197,7 +187,7 @@ commands = bash scripts/dev/run_shellcheck.sh {posargs} [testenv:mypy] basepython = {env:PYTHON:python3} pip_version = pip -passenv = TERM +passenv = TERM MYPY_FORCE_TERMINAL_WIDTH deps = -r{toxinidir}/requirements.txt -r{toxinidir}/misc/requirements/requirements-dev.txt @@ -206,6 +196,13 @@ deps = commands = {envpython} -m mypy qutebrowser tests {posargs} +[testenv:yamllint] +basepython = {env:PYTHON:python3} +pip_version = pip +deps = -r{toxinidir}/misc/requirements/requirements-yamllint.txt +commands = + {envpython} -m yamllint -f colored --strict . {posargs} + [testenv:mypy-diff] basepython = {env:PYTHON:python3} pip_version = pip |