From 812fc057934b119c9680d8e79c9860bbc36c8b5b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jul 2020 18:07:21 -0400
Subject: Disable adopted distutils while troubleshooting #2228 and #2230.

---
 setuptools/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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
-- 
cgit v1.2.3


From 8c85de4eeffc88b00f367fecd7caba81a0351f45 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jul 2020 18:08:20 -0400
Subject: Update changelog. Ref #2228 and #2230.

---
 changelog.d/2228.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2228.change.rst

diff --git a/changelog.d/2228.change.rst b/changelog.d/2228.change.rst
new file mode 100644
index 00000000..82cf8a05
--- /dev/null
+++ b/changelog.d/2228.change.rst
@@ -0,0 +1 @@
+Disabled distutils adoption for now while emergent issues are addressed.
-- 
cgit v1.2.3


From d0c71ab32deea2be265a8fcdec020089a8d1d987 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jul 2020 18:12:39 -0400
Subject: Omit distutils_patch from test collection.

---
 conftest.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conftest.py b/conftest.py
index 72edcf14..50cc6509 100644
--- a/conftest.py
+++ b/conftest.py
@@ -15,6 +15,7 @@ collect_ignore = [
     'tests/manual_test.py',
     'setuptools/tests/mod_with_constant.py',
     'setuptools/_distutils',
+    'setuptools/distutils_patch.py',
 ]
 
 
-- 
cgit v1.2.3