aboutsummaryrefslogtreecommitdiffstats
path: root/pytest.ini
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2017-09-03 19:57:54 -0400
committerJason R. Coombs <jaraco@jaraco.com>2017-09-03 20:01:45 -0400
commitdcb24ad15465c266a3f258471766fbbe8fc8a42e (patch)
tree13123440610d78e398476a8ce1e8cc3d9f9ec72e /pytest.ini
parentf14930e66601b462699c44384c482cd966f53b8f (diff)
parent1b192005562d5cf0de30c02154c58fd1dca577c8 (diff)
downloadexternal_python_setuptools-dcb24ad15465c266a3f258471766fbbe8fc8a42e.tar.gz
external_python_setuptools-dcb24ad15465c266a3f258471766fbbe8fc8a42e.tar.bz2
external_python_setuptools-dcb24ad15465c266a3f258471766fbbe8fc8a42e.zip
Merge branch 'master' into drop-py26
Diffstat (limited to 'pytest.ini')
-rwxr-xr-xpytest.ini2
1 files changed, 1 insertions, 1 deletions
diff --git a/pytest.ini b/pytest.ini
index c814b316..16fdc5af 100755
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,5 +1,5 @@
[pytest]
-addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/test_pypi.py --ignore tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt --ignore scripts/upload-old-releases-as-zip.py --ignore pavement.py
+addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/test_pypi.py --ignore tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt --ignore scripts/upload-old-releases-as-zip.py --ignore pavement.py --ignore setuptools/tests/mod_with_constant.py -rsxX
norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern .*
flake8-ignore =
setuptools/site-patch.py F821