diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2020-07-03 15:11:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-03 15:11:32 -0400 |
| commit | 5f151cbbcd6c65f7f48082bfaf36db3a55df936e (patch) | |
| tree | eb721c8957ee48c5149af6742a27a449fb618027 /conftest.py | |
| parent | a9eb9e73def8ca6c469e59f1b008746e368ad4c1 (diff) | |
| parent | a877dab0bddaeb5503d871794ca06f1c81d805b8 (diff) | |
| download | external_python_setuptools-5f151cbbcd6c65f7f48082bfaf36db3a55df936e.tar.gz external_python_setuptools-5f151cbbcd6c65f7f48082bfaf36db3a55df936e.tar.bz2 external_python_setuptools-5f151cbbcd6c65f7f48082bfaf36db3a55df936e.zip | |
Merge branch 'master' into 2020-06-11-raise-from
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 1746bfb5..72edcf14 100644 --- a/conftest.py +++ b/conftest.py @@ -14,6 +14,7 @@ def pytest_addoption(parser): collect_ignore = [ 'tests/manual_test.py', 'setuptools/tests/mod_with_constant.py', + 'setuptools/_distutils', ] |