Skip to content

Commit 66d49a8

Browse files
committed
Rename linter environments in tox.ini to be tool-agnostic
1 parent b19862b commit 66d49a8

2 files changed

Lines changed: 14 additions & 11 deletions

File tree

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ jobs:
5050
fail-fast: false
5151
matrix:
5252
linter:
53-
- mypy
54-
- flake8
55-
- black
56-
- pydocstyle
53+
- typecheck
54+
- codestyle
55+
- docstyle
56+
- codeformat
5757
steps:
5858
- name: Checkout code
5959
uses: actions/checkout@v1

tox.ini

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
[tox]
2-
envlist = py{27,34}{,-scandir}, py{35,36,37,38,39}, pypy{27,36,37}, mypy, lint
2+
envlist = py{27,34}{,-scandir}, py{35,36,37,38,39}, pypy{27,36,37}, typecheck, codestyle, docstyle, codeformat
33
sitepackages = false
44
skip_missing_interpreters = true
5+
requires =
6+
setuptools >=38.3.0
57

68
[testenv]
79
commands = pytest --cov={toxinidir}/fs {posargs} {toxinidir}/tests
@@ -16,14 +18,14 @@ deps =
1618
scandir: .[scandir]
1719
!scandir: .
1820

19-
[testenv:mypy]
21+
[testenv:typecheck]
2022
commands = mypy --config-file {toxinidir}/setup.cfg {toxinidir}/fs
2123
deps =
2224
.
2325
mypy==0.800
2426

25-
[testenv:flake8]
26-
commands = flake8 {toxinidir}/fs {toxinidir}/tests
27+
[testenv:codestyle]
28+
commands = flake8 --config={toxinidir}/setup.cfg {toxinidir}/fs {toxinidir}/tests
2729
deps =
2830
flake8==3.7.9
2931
#flake8-builtins==1.5.3
@@ -32,14 +34,15 @@ deps =
3234
flake8-mutable==1.2.0
3335
flake8-tuple==0.4.0
3436

35-
[testenv:black]
37+
[testenv:codeformat]
3638
commands = black --check {toxinidir}/fs
3739
deps =
3840
black==20.8b1
3941

40-
[testenv:pydocstyle]
41-
python = python3.9
42+
[testenv:docstyle]
4243
commands = pydocstyle --config={toxinidir}/setup.cfg {toxinidir}/fs
44+
deps =
45+
pydocstyle==5.1.1
4346

4447
[gh-actions]
4548
python =

0 commit comments

Comments
 (0)