diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2020-09-23 17:26:24 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2020-09-23 17:26:34 -0400 |
| commit | 8cca69b8ffd372ce5e3089cebbdbf92c071f3761 (patch) | |
| tree | 6300de4fda7c64f81ecc98e54c1ca3e3ea9bd5d5 /conftest.py | |
| parent | f852d1598a7814f5f4f6e8bf26d3d60cffe1798a (diff) | |
| parent | 662816b65fbbfaf4e8ff523e39a6034785a4d8eb (diff) | |
| download | python-setuptools-git-feature/2093-docs-revamp.tar.gz | |
Merge branch 'master' into feature/2093-docs-revampfeature/2093-docs-revamp
Diffstat (limited to 'conftest.py')
| -rw-r--r-- | conftest.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/conftest.py b/conftest.py index 1746bfb5..41ab30b9 100644 --- a/conftest.py +++ b/conftest.py @@ -14,13 +14,10 @@ def pytest_addoption(parser): collect_ignore = [ 'tests/manual_test.py', 'setuptools/tests/mod_with_constant.py', + 'setuptools/_distutils', + '_distutils_hack', ] -if sys.version_info < (3,): - collect_ignore.append('setuptools/lib2to3_ex.py') - collect_ignore.append('setuptools/_imp.py') - - if sys.version_info < (3, 6): collect_ignore.append('pavement.py') |