diff options
| author | Bastian Venthur <bastian.venthur@flixbus.com> | 2020-02-11 09:55:35 +0100 |
|---|---|---|
| committer | Bastian Venthur <bastian.venthur@flixbus.com> | 2020-02-11 09:55:35 +0100 |
| commit | 087c3b26eed9b6a8960815c2773edd04b5c91a98 (patch) | |
| tree | c0b0bf68b6f02980f742611c9232405ab9df299b /conftest.py | |
| parent | c11270aa6bffd8913c6e074f09b9d920c8f19002 (diff) | |
| parent | a5dec2f14e3414e4ee5dd146bff9c289d573de9a (diff) | |
| download | external_python_setuptools-087c3b26eed9b6a8960815c2773edd04b5c91a98.tar.gz external_python_setuptools-087c3b26eed9b6a8960815c2773edd04b5c91a98.tar.bz2 external_python_setuptools-087c3b26eed9b6a8960815c2773edd04b5c91a98.zip | |
Merge branch 'master' into fix/1700
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): |