From 48888b43ddb3be2e9191eb435bae6ba4f72d4137 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Mon, 25 Jan 2021 18:25:03 +0000
Subject: [PATCH 1/2] Update isort to v5.7.0

This new version no longer has the problem of adding/removing a blank line in
.pyi files, which black disagrees with.
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index ddbe9f511af3..99425d52de8c 100755
--- a/setup.py
+++ b/setup.py
@@ -96,7 +96,7 @@ def exec_file(path_segments):
 #
 # We pin black so that our tests don't start failing on new releases.
 CONDITIONAL_REQUIREMENTS["lint"] = [
-    "isort==5.0.3",
+    "isort==5.7.0",
     "black==19.10b0",
     "flake8-comprehensions",
     "flake8",

From eef935d4d719e16326f8b7ef46754e92a8946b90 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Mon, 25 Jan 2021 18:35:47 +0000
Subject: [PATCH 2/2] Changelog

---
 changelog.d/9222.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/9222.misc

diff --git a/changelog.d/9222.misc b/changelog.d/9222.misc
new file mode 100644
index 000000000000..37490717b3ca
--- /dev/null
+++ b/changelog.d/9222.misc
@@ -0,0 +1 @@
+Update `isort` to v5.7.0 to bypass a bug where it would disagree with `black` about formatting.
\ No newline at end of file