Skip to content

Commit 49ba845

Browse files
committed
Move away from setup.py test; merge tox.ini into setup.cfg
`setup.py test` is deprecated for a quite long time: pypa/setuptools#1878
1 parent 852c45a commit 49ba845

File tree

2 files changed

+24
-18
lines changed

2 files changed

+24
-18
lines changed

setup.cfg

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,29 +19,41 @@ install_requires =
1919
simplejson>=3.16.0
2020
sqlalchemy>=1.3.0
2121
setup_requires =
22-
pytest-runner>=5.1
2322
setuptools_scm>=3.3.3
24-
tests_require =
25-
lovely-pytest-docker>=0.1.0
26-
pytest>=5.1.0
27-
pytest-asyncio>=0.10.0
28-
pytest-cov>=2.7.1
2923

3024
[options.package_data]
3125
aiochsa = type.lark
3226

33-
[aliases]
34-
test = pytest
35-
3627
[tool:pytest]
3728
testpaths = tests
38-
addopts = --strict-markers -r aP --tb=native --cov
29+
addopts = --strict-markers -r aP --tb=native
3930
filterwarnings = error
4031

4132
[coverage:run]
4233
branch = True
43-
source =
44-
aiochsa
34+
source = .
35+
omit =
36+
setup.py
37+
tests/*
38+
.tox/*
4539

4640
[coverage:report]
4741
show_missing = True
42+
43+
44+
[tox:tox]
45+
envlist = py{37,38,39},mypy
46+
47+
[testenv]
48+
deps =
49+
lovely-pytest-docker>=0.1.0
50+
pytest>=5.1.0
51+
pytest-asyncio>=0.10.0
52+
pytest-cov>=2.7.1
53+
six # Required by lovely-pytest-docker, but not included in its deps
54+
commands = pytest {posargs:--cov --cov-report=}
55+
56+
[testenv:mypy]
57+
basepython = python3.8
58+
deps = mypy
59+
commands = mypy -p aiochsa -p tests

tox.ini

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)