Move ignores into conftest.py

2 files changed, 13 insertions, 1 deletions

diff --git a/conftest.py b/conftest.py
index 3cccfe1a..13dc709a 100644
--- a/conftest.py
+++ b/conftest.py
@@ -6,3 +6,15 @@ def pytest_addoption(parser):
         "--package_name", action="append", default=[],
         help="list of package_name to pass to test functions",
     )
+
+
+collect_ignore = [
+    'release.py',
+    'setuptools/lib2to3_ex.py',
+    'tests/manual_test.py',
+    'tests/test_pypi.py',
+    'tests/shlib_test',
+    'scripts/upload-old-releases-as-zip.py',
+    'pavement.py',
+    'setuptools/tests/mod_with_constant.py',
+]
diff --git a/pytest.ini b/pytest.ini
index 6ec3be88..1c5b6b09 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 --ignore setuptools/tests/mod_with_constant.py -rsxX
+addopts=--doctest-modules --doctest-glob=pkg_resources/api_tests.txt -rsxX
 norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern .*
 flake8-ignore =
     setuptools/site-patch.py F821