diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2020-03-21 05:55:44 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2020-03-21 05:55:44 -0400 |
| commit | cfbefe5715e31db3c8cac70f7a1cd1c16fd4b5a7 (patch) | |
| tree | 1551248b2a29b34b26388ea68fe994854f3e84e2 /conftest.py | |
| parent | 7843688bc33dd4e13e10130bc49da4c290fe7d7f (diff) | |
| parent | 060445bfb557a1d0f6b726716dafa6bacaa44c34 (diff) | |
| download | python-setuptools-git-cfbefe5715e31db3c8cac70f7a1cd1c16fd4b5a7.tar.gz | |
Merge branch 'master' into jorikdima-master
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): |