summaryrefslogtreecommitdiff
path: root/pytest.ini
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2020-03-07 15:53:27 -0500
committerJason R. Coombs <jaraco@jaraco.com>2020-03-07 15:53:27 -0500
commit85df5f7766f9ba4f0d238298d0d57e86fad8fe80 (patch)
treea22c9aa70e510fb87a682524903f0e4b97f3fd59 /pytest.ini
parentf265e4089c63bfa17d8024d0d6a574c2aaaa992d (diff)
parent25edd1951d8d44c34578c926f5c20ed3d452587b (diff)
downloadpython-setuptools-git-85df5f7766f9ba4f0d238298d0d57e86fad8fe80.tar.gz
Merge branch 'master' into feature/1823-fail-warnings
Diffstat (limited to 'pytest.ini')
-rw-r--r--pytest.ini7
1 files changed, 2 insertions, 5 deletions
diff --git a/pytest.ini b/pytest.ini
index 1400d122..4cd94d5a 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,9 +1,6 @@
[pytest]
-addopts=--doctest-modules --doctest-glob=pkg_resources/api_tests.txt -r sxX
-norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern .*
-flake8-ignore =
- setuptools/site-patch.py F821
- setuptools/py*compat.py F811
+addopts=--doctest-modules --flake8 --doctest-glob=pkg_resources/api_tests.txt -r sxX
+norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern pkg_resources/tests/data tools .* setuptools/_vendor pkg_resources/_vendor
doctest_optionflags=ELLIPSIS ALLOW_UNICODE
filterwarnings =
# Fail on warnings