Skip to content

Commit b5bf9ad

Browse files
committed
Merge pytest.ini with setup.cfg, remove doctest opt in setup.cfg
Got confused when I couldn't find doctest_optionflags in setup.cfg, but then found them in pytest.ini. Is there a reason pytest is configured in two places? I might have misunderstood the setup, I also removed --doctest-modules from addopts since that's added to env on the linux travis job, and set by invoke test --doctest otherwise.
1 parent c9793b3 commit b5bf9ad

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

pytest.ini

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

setup.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ exclude =
1717
convention = numpy
1818

1919
[tool:pytest]
20-
testpaths = tests
20+
testpaths = src tests
2121
norecursedirs =
2222
migrations
2323

@@ -28,9 +28,9 @@ python_files =
2828
addopts =
2929
-ra
3030
--strict
31-
--doctest-modules
3231
--doctest-glob=\*.rst
3332
--tb=short
33+
doctest_optionflags= NORMALIZE_WHITESPACE IGNORE_EXCEPTION_DETAIL ALLOW_UNICODE ALLOW_BYTES
3434

3535
[isort]
3636
force_single_line = True

0 commit comments

Comments
 (0)