aboutsummaryrefslogtreecommitdiffstats
path: root/conftest.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2019-11-16 13:08:45 -0500
committerJason R. Coombs <jaraco@jaraco.com>2019-11-16 13:08:45 -0500
commit3e755ec7c23a769348a2a75023adf0d59a3bb725 (patch)
tree55b6e069218cb4177b7f7a4fb1a242131381e0cd /conftest.py
parent88951e9a5633abd4cdbfa3584647cec4247b8c30 (diff)
parenta00798264cf4d55db28585cfc147050a4d579b52 (diff)
downloadexternal_python_setuptools-3e755ec7c23a769348a2a75023adf0d59a3bb725.tar.gz
external_python_setuptools-3e755ec7c23a769348a2a75023adf0d59a3bb725.tar.bz2
external_python_setuptools-3e755ec7c23a769348a2a75023adf0d59a3bb725.zip
Merge branch 'master' into feature/distribution-options-hooks
Diffstat (limited to 'conftest.py')
-rw-r--r--conftest.py1
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):