summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2020-09-24 10:29:40 -0400
committerJason R. Coombs <jaraco@jaraco.com>2020-09-24 10:49:50 -0400
commit896ef66ff3b167a13a5efb128013d5bd53633a79 (patch)
tree5f62c30c69a4a79b96e4777ce7e64ff97161f2b3
parentda415dd76a5613c5cdafb16cd5f21e5b6cce3801 (diff)
downloadpython-setuptools-git-896ef66ff3b167a13a5efb128013d5bd53633a79.tar.gz
Move setuptools-specific excluded folders to collect_ignore to match with jaraco/skeleton.
-rw-r--r--conftest.py5
-rw-r--r--pytest.ini2
2 files changed, 6 insertions, 1 deletions
diff --git a/conftest.py b/conftest.py
index 41ab30b9..f896561e 100644
--- a/conftest.py
+++ b/conftest.py
@@ -16,6 +16,11 @@ collect_ignore = [
'setuptools/tests/mod_with_constant.py',
'setuptools/_distutils',
'_distutils_hack',
+ 'setuptools/extern',
+ 'pkg_resources/extern',
+ 'pkg_resources/tests/data',
+ 'setuptools/_vendor',
+ 'pkg_resources/_vendor',
]
diff --git a/pytest.ini b/pytest.ini
index a875e1e9..162ad873 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,6 +1,6 @@
[pytest]
addopts=--doctest-modules --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
+norecursedirs=dist build .tox .eggs
doctest_optionflags=ELLIPSIS ALLOW_UNICODE
filterwarnings =
# Fail on warnings