diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2020-09-14 19:59:33 -0400 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2020-09-14 19:59:33 -0400 |
commit | c85addee0793d2331be76b0fc515ec039433ddd3 (patch) | |
tree | bf540da6b3978b67ff8e1952f5c36c541fc72568 /conftest.py | |
parent | 8fa0599ae2f2309ee5fb48b4c87dc8f2d7ea2f2c (diff) | |
parent | 2995140fe8fc3d0de9f9fa6fe0d574dc2d9a0ca3 (diff) | |
download | python-setuptools-git-c85addee0793d2331be76b0fc515ec039433ddd3.tar.gz |
Merge branch 'master' into feature/plugins-enabled-by-default
Diffstat (limited to 'conftest.py')
-rw-r--r-- | conftest.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/conftest.py b/conftest.py index 90090253..41ab30b9 100644 --- a/conftest.py +++ b/conftest.py @@ -19,10 +19,5 @@ collect_ignore = [ ] -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') |