aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2020-07-05 16:45:28 -0400
committerJason R. Coombs <jaraco@jaraco.com>2020-07-05 16:45:28 -0400
commitd61166f01d3198a6d227acad616e0415108c9a0c (patch)
tree96b44ccbccd4f80707de28b3262effa90b53c4fa /setuptools
parent44cec449385cac29b0f6c9719b506eb6b8c1826d (diff)
parent5e179ffca0a6ed5f3369139baaea61094df38524 (diff)
downloadexternal_python_setuptools-d61166f01d3198a6d227acad616e0415108c9a0c.tar.gz
external_python_setuptools-d61166f01d3198a6d227acad616e0415108c9a0c.tar.bz2
external_python_setuptools-d61166f01d3198a6d227acad616e0415108c9a0c.zip
Merge branch 'master' into bugfix/2228-spawn-missing
Diffstat (limited to 'setuptools')
-rw-r--r--setuptools/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 7a1f9f4f..a6cbe132 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -3,7 +3,8 @@
import os
import functools
-import setuptools.distutils_patch # noqa: F401
+# Disabled for now due to: #2228, #2230
+# import setuptools.distutils_patch # noqa: F401
import distutils.core
import distutils.filelist