Skip to content

Commit e413c70

Browse files
committed
Change "check" tox env to "linting" which runs pre-commit
1 parent c253ce2 commit e413c70

File tree

3 files changed

+11
-13
lines changed

3 files changed

+11
-13
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ language: python
44
jobs:
55
include:
66
- python: '3.6'
7-
env: TOXENV=check
7+
env: TOXENV=linting
88
- python: '3.6'
99
env: TOXENV=docs
1010
- python: '2.7'

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
environment:
22
matrix:
33
# note: please use "tox --listenvs" to populate the build matrix below
4-
- TOXENV: "check"
4+
- TOXENV: "linting"
55
- TOXENV: "docs"
66
- TOXENV: "py27-pytestrelease"
77
- TOXENV: "py34-pytestrelease"

tox.ini

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[tox]
2-
envlist=check,docs,py{27,34,35,36,py}-pytestrelease,py{27,36}-pytest{master,features}
2+
envlist=linting,docs,py{27,34,35,36,py}-pytestrelease,py{27,36}-pytest{master,features}
33

44
[testenv]
5-
commands=py.test {posargs:testing/}
5+
commands=pytest {posargs:testing/}
66
setenv=
77
_PYTEST_SETUP_SKIP_PLUGGY_DEP=1
88
deps=
@@ -11,19 +11,17 @@ deps=
1111
pytestfeatures: git+https://github.com/pytest-dev/pytest.git@features
1212

1313
[testenv:benchmark]
14-
commands=py.test {posargs:testing/benchmark.py}
14+
commands=pytest {posargs:testing/benchmark.py}
1515
deps=
1616
pytest
1717
pytest-benchmark
1818

19-
[testenv:check]
20-
deps =
21-
flake8
22-
restructuredtext_lint
23-
pygments
24-
commands =
25-
flake8 pluggy.py setup.py testing
26-
rst-lint CHANGELOG.rst README.rst
19+
[testenv:linting]
20+
skipsdist = True
21+
usedevelop = True
22+
basepython = python3.6
23+
deps = pre-commit
24+
commands = pre-commit run --all-files --show-diff-on-failure
2725

2826
[testenv:docs]
2927
deps =

0 commit comments

Comments
 (0)