From b40634045c0dde124f9d2ec62afce05186437602 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Wed, 24 Mar 2021 06:52:42 -0400
Subject: [PATCH 1/2] Bump mypy-zope to 0.2.13.

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index b834e4e55bd2..1939a7b86b5c 100755
--- a/setup.py
+++ b/setup.py
@@ -103,7 +103,7 @@ def exec_file(path_segments):
     "flake8",
 ]
 
-CONDITIONAL_REQUIREMENTS["mypy"] = ["mypy==0.812", "mypy-zope==0.2.11"]
+CONDITIONAL_REQUIREMENTS["mypy"] = ["mypy==0.812", "mypy-zope==0.2.13"]
 
 # Dependencies which are exclusively required by unit test code. This is
 # NOT a list of all modules that are necessary to run the unit tests.

From 385b44e4502dc93075faccbaea0d5a9d0471e8e6 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Wed, 24 Mar 2021 06:54:11 -0400
Subject: [PATCH 2/2] Newsfragment

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

diff --git a/changelog.d/9678.misc b/changelog.d/9678.misc
new file mode 100644
index 000000000000..77a2b2d439ec
--- /dev/null
+++ b/changelog.d/9678.misc
@@ -0,0 +1 @@
+Bump mypy-zope to 0.2.13 to fix "Cannot determine consistent method resolution order (MRO)" errors when running mypy a second time.