switch linting tox env to use pre-commit, clean out travis linting env as unneeded
This commit is contained in:
parent
6eb7af5a4e
commit
df17bb2bd3
|
@ -19,3 +19,11 @@ repos:
|
||||||
rev: v1.2.0
|
rev: v1.2.0
|
||||||
hooks:
|
hooks:
|
||||||
- id: pyupgrade
|
- id: pyupgrade
|
||||||
|
- repo: local
|
||||||
|
hooks:
|
||||||
|
- id: rst
|
||||||
|
name: rst
|
||||||
|
entry: python scripts/check-rst.py
|
||||||
|
language: python
|
||||||
|
additional_dependencies: [pygments, restructuredtext_lint]
|
||||||
|
python_version: python3.6
|
||||||
|
|
|
@ -13,7 +13,7 @@ env:
|
||||||
# coveralls is not listed in tox's envlist, but should run in travis
|
# coveralls is not listed in tox's envlist, but should run in travis
|
||||||
- TOXENV=coveralls
|
- TOXENV=coveralls
|
||||||
# note: please use "tox --listenvs" to populate the build matrix below
|
# note: please use "tox --listenvs" to populate the build matrix below
|
||||||
- TOXENV=linting
|
# please remove the linting env in all cases
|
||||||
- TOXENV=py27
|
- TOXENV=py27
|
||||||
- TOXENV=py34
|
- TOXENV=py34
|
||||||
- TOXENV=py36
|
- TOXENV=py36
|
||||||
|
|
12
tox.ini
12
tox.ini
|
@ -38,15 +38,9 @@ commands =
|
||||||
[testenv:linting]
|
[testenv:linting]
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
basepython = python2.7
|
basepython = python3.6
|
||||||
deps =
|
deps = pre-commit
|
||||||
flake8
|
commands = pre-commit run --all-files
|
||||||
# pygments required by rst-lint
|
|
||||||
pygments
|
|
||||||
restructuredtext_lint
|
|
||||||
commands =
|
|
||||||
flake8 pytest.py _pytest testing setup.py pytest.py
|
|
||||||
{envpython} scripts/check-rst.py
|
|
||||||
|
|
||||||
[testenv:py27-xdist]
|
[testenv:py27-xdist]
|
||||||
deps =
|
deps =
|
||||||
|
|
Loading…
Reference in New Issue