switch linting tox env to use pre-commit, clean out travis linting env as unneeded

This commit is contained in:
Ronny Pfannschmidt 2018-05-24 14:17:09 +02:00
parent 6eb7af5a4e
commit df17bb2bd3
3 changed files with 12 additions and 10 deletions

View File

@ -19,3 +19,11 @@ repos:
rev: v1.2.0
hooks:
- 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

View File

@ -13,7 +13,7 @@ env:
# coveralls is not listed in tox's envlist, but should run in travis
- TOXENV=coveralls
# note: please use "tox --listenvs" to populate the build matrix below
- TOXENV=linting
# please remove the linting env in all cases
- TOXENV=py27
- TOXENV=py34
- TOXENV=py36

12
tox.ini
View File

@ -38,15 +38,9 @@ commands =
[testenv:linting]
skipsdist = True
usedevelop = True
basepython = python2.7
deps =
flake8
# pygments required by rst-lint
pygments
restructuredtext_lint
commands =
flake8 pytest.py _pytest testing setup.py pytest.py
{envpython} scripts/check-rst.py
basepython = python3.6
deps = pre-commit
commands = pre-commit run --all-files
[testenv:py27-xdist]
deps =