replace various things with a single lint

This commit is contained in:
Amber Brown 2018-07-25 16:55:16 +10:00
parent b9199e4edb
commit e64840dffa
1 changed files with 10 additions and 41 deletions

51
tox.ini
View File

@ -32,7 +32,7 @@
minversion=2.4
skip_missing_interpreters=True
toxworkdir=build/
envlist=pyflakes,apidocs,narrativedocs,newsfragment,manifest-checker,py27-alldeps-nocov,py36-alldeps-nocov
envlist=lint,pyflakes,apidocs,narrativedocs,newsfragment,manifest-checker,py27-alldeps-nocov,py36-alldeps-nocov
[testenv]
;; dependencies managed by extras in t.p._setup.py._EXTRAS_REQUIRE
@ -57,16 +57,12 @@ deps =
wheel: wheel
; Code quality checkers
pyflakes{,3}: pyflakes
manifest-checker: check-manifest
; We go with unreleased version as PyPI version is 1 year old.
; Also, I hope that the Twisted blank_lines will be supported soon upstream
; and also released soon on PyPI, so that we no longer have to use a
; commit.
{pycodestyle,pycodestylediff}: https://github.com/pycqa/pycodestyle/archive/eb91b79ab38aad4d44a3b52b02605412f32ba5ae.zip
{twistedchecker,txchecker-travis}: twistedchecker>=0.7.1
txchecker-travis: diff-cover==0.9.12
lint: pyflakes
lint: twistedchecker>=0.7.1
lint: diff-cover==0.9.12
lint: pycodestyle
; All environment variables are passed.
passenv = *
@ -80,7 +76,7 @@ setenv =
TOX_INI_DIR = {toxinidir}
; Skip twistedchecker warnings that are not yet required in the required run
txchecker-travis-required: TWISTEDCHECKER_SKIP_WARNINGS = W9208,C0302,C0103,C9302
lint: TWISTEDCHECKER_SKIP_WARNINGS = W9208,C0302,C0103,C9302
commands =
;
@ -114,11 +110,9 @@ commands =
; Build in a root folder so that buildbot can pick the result
wheel: python setup.py bdist_wheel --dist-dir {toxinidir}/dist
twistedchecker: twistedchecker src/{posargs:twisted}
txchecker-travis: {toxinidir}/.travis/twistedchecker-trunk-diff.sh {posargs:twisted}
pyflakes: pyflakes {posargs:src/twisted admin bin}
pyflakes3: /bin/sh -c "pyflakes $(find src/twisted admin bin \! -name "compat.py" \! -name "test_compat.py" \! -name "dict.py" -name '*.py' -o -name '*.3only')"
lint: /bin/sh -c "pyflakes $(find src/twisted admin bin \! -name "compat.py" \! -name "test_compat.py" \! -name "dict.py" -name '*.py' -o -name '*.3only')"
lint: {toxinidir}/.travis/twistedchecker-trunk-diff.sh {posargs:twisted}
lint: /bin/sh -c "git diff trunk | python {toxinidir}/admin/pycodestyle-twisted.py --diff"
apidocs: {toxinidir}/bin/admin/build-apidocs {toxinidir}/src/ apidocs
narrativedocs: sphinx-build -aW -b html -d {toxinidir}/docs/_build {toxinidir}/docs {toxinidir}/docs/_build/
@ -127,21 +121,6 @@ commands =
manifest-checker: check-manifest --ignore "docs/_build*,docs/historic/*,admin*,bin/admin*,twisted/topfiles/*.Old"
pycodestyle: python {toxinidir}/admin/pycodestyle-twisted.py {posargs:admin src/twisted}
; Travis-CI version is executing in diff mode without any input arguments.
pycodestylediff: /bin/sh -c "git diff trunk | python {toxinidir}/admin/pycodestyle-twisted.py --diff"
[testenv:pyflakes]
basepython=python2.7
# Static checkers don't need to install the source code.
skip_install = true
[testenv:pyflakes3]
basepython=python3.6
# Static checkers don't need to install the source code.
skip_install = true
[testenv:apidocs]
# Epydoc and pydoctor currently on work on Python 2
basepython=python2.7
@ -149,17 +128,7 @@ basepython=python2.7
[testenv:manifest-checker]
skip_install = true
[testenv:pycodestyle]
skip_install = true
[testenv:pycodestylediff]
skip_install = true
# TwistedChecker needs to be 3.5
[testenv:twistedchecker]
basepython=python3.5
# TwistedChecker needs to be 3.5
[testenv:txchecker-travis-required]
[testenv:lint]
basepython=python3.5
usedevelop=True