diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2020-08-09 14:49:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-09 14:49:59 -0400 |
| commit | 00e46c2a4a00da24997f3a0b3128128aa80cb693 (patch) | |
| tree | 38ca86355b92aecb80c5b09d16aa8ab393b99cf0 /conftest.py | |
| parent | 59e116c84d76adc9548d1e9a71e7d8f5c22a8b85 (diff) | |
| parent | 7cf009a7e39270e1e1d13d913e0c352fb00534c0 (diff) | |
| download | external_python_setuptools-00e46c2a4a00da24997f3a0b3128128aa80cb693.tar.gz external_python_setuptools-00e46c2a4a00da24997f3a0b3128128aa80cb693.tar.bz2 external_python_setuptools-00e46c2a4a00da24997f3a0b3128128aa80cb693.zip | |
Merge pull request #2305 from pypa/distutils-import-hack
Prefer included distutils even without importing setuptools. Closes #2259.
Diffstat (limited to 'conftest.py')
| -rw-r--r-- | conftest.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conftest.py b/conftest.py index 6013e187..25537f56 100644 --- a/conftest.py +++ b/conftest.py @@ -15,7 +15,7 @@ collect_ignore = [ 'tests/manual_test.py', 'setuptools/tests/mod_with_constant.py', 'setuptools/_distutils', - 'setuptools/distutils_patch.py', + '_distutils_hack', ] |