From 265397840373a4357d4872dc0b17b88e3ab948b7 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Fri, 27 Aug 2021 14:50:22 +0200
Subject: [PATCH 1/2] Add top line to towncrier template

Fixes #8817
Supersedes #9045
See https://github.com/twisted/towncrier/issues/346 and
https://github.com/twisted/towncrier/issues/340
---
 changelog/_template.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changelog/_template.rst b/changelog/_template.rst
index 5de4ae97ea8..5c4cc6ba07a 100644
--- a/changelog/_template.rst
+++ b/changelog/_template.rst
@@ -1,3 +1,6 @@
+
+{{ top_underline * ((top_line)|length)}}
+
 {% for section in sections %}
 {% set underline = "-" %}
 {% if section %}

From 511fd68f0b0b8e28de797982e2d67c04586638d5 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.