From 16ab1d6944f346734982ee99627a08fa8329d8d7 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Fri, 27 Aug 2021 09:19:12 -0300
Subject: [PATCH 1/2] Pin towncrier to 18.6.0 due to twisted/towncrier#346

Close #8817
---
 tox.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index c6dd3f477ee..b9c3b6c33da 100644
--- a/tox.ini
+++ b/tox.ini
@@ -146,7 +146,8 @@ deps =
     github3.py
     pre-commit>=2.9.3
     wheel
-    towncrier
+    # Pinned because of twisted/towncrier#346
+    towncrier ==18.6.0
 commands = python scripts/release.py {posargs}
 
 [testenv:prepare-release-pr]

From aa6955e45c5bcf873398fae5744abcac1e94a14e Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Fri, 27 Aug 2021 09:20:42 -0300
Subject: [PATCH 2/2] Add changelog for #9040 (pluggy 1.0)

---
 changelog/9040.trivial.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog/9040.trivial.rst

diff --git a/changelog/9040.trivial.rst b/changelog/9040.trivial.rst
new file mode 100644
index 00000000000..aebe21b31d7
--- /dev/null
+++ b/changelog/9040.trivial.rst
@@ -0,0 +1 @@
+Enable compatibility with ``pluggy 1.0`` or later.