diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2020-02-11 22:15:31 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2020-02-11 22:15:31 -0500 |
| commit | ce8e3ee174ed9dee84aa08a461fb174ac1e53535 (patch) | |
| tree | da78c024b4491210e61b73e9e2f755d46c8bc1ff /conftest.py | |
| parent | 53b8523fdfa19173d2e6b11d6b4d175f54b9dfea (diff) | |
| parent | a5dec2f14e3414e4ee5dd146bff9c289d573de9a (diff) | |
| download | python-setuptools-git-ce8e3ee174ed9dee84aa08a461fb174ac1e53535.tar.gz | |
Merge branch 'master' into fix/1557
Diffstat (limited to 'conftest.py')
| -rw-r--r-- | conftest.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/conftest.py b/conftest.py index 0d7b274c..1746bfb5 100644 --- a/conftest.py +++ b/conftest.py @@ -19,6 +19,7 @@ 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): |