diff options
| author | Ronny Pfannschmidt <opensource@ronnypfannschmidt.de> | 2018-05-24 14:17:09 +0200 |
|---|---|---|
| committer | Ronny Pfannschmidt <opensource@ronnypfannschmidt.de> | 2018-05-24 14:17:09 +0200 |
| commit | df17bb2bd38a1f40bbd748c9cc7ae2c4b864949c (patch) | |
| tree | a1d40ff193fe8e942c11faad8b28c54568ad70b2 | |
| parent | 6eb7af5a4edaae0d4b8afcd946f1671c9deffe0f (diff) | |
| download | pytest-df17bb2bd38a1f40bbd748c9cc7ae2c4b864949c.tar.gz | |
switch linting tox env to use pre-commit, clean out travis linting env as unneeded
| -rw-r--r-- | .pre-commit-config.yaml | 8 | ||||
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | tox.ini | 12 |
3 files changed, 12 insertions, 10 deletions
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4f3b33089..bb45976f1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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 diff --git a/.travis.yml b/.travis.yml index 0c6aa629f..a8e6a1815 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 @@ -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 = |