From 09aa2e3aa3e16f02669f5df8013e81bfb9daec16 Mon Sep 17 00:00:00 2001
From: Ran Benita <ran@unusedvar.com>
Date: Sun, 18 Jun 2023 00:23:52 +0300
Subject: [PATCH] Preparing release 1.1.0

---
 CHANGELOG.rst             | 35 +++++++++++++++++++++++++++++++++++
 changelog/260.feature.rst | 10 ----------
 changelog/364.feature.rst |  1 -
 changelog/364.removal.rst |  1 -
 changelog/394.feature.rst |  5 -----
 5 files changed, 35 insertions(+), 17 deletions(-)
 delete mode 100644 changelog/260.feature.rst
 delete mode 100644 changelog/364.feature.rst
 delete mode 100644 changelog/364.removal.rst
 delete mode 100644 changelog/394.feature.rst

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c0323c45..21e6dff4 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -21,6 +21,41 @@ Versions follow `Semantic Versioning <https://semver.org/>`_ (``<major>.<minor>.
 
 .. towncrier release notes start
 
+pluggy 1.1.0 (2023-06-19)
+=========================
+
+Deprecations and Removals
+-------------------------
+
+- `#364 <https://github.com/pytest-dev/pluggy/issues/364>`_: Python 3.6 is no longer supported.
+
+
+
+Features
+--------
+
+- `#260 <https://github.com/pytest-dev/pluggy/issues/260>`_: Added "new-style" hook wrappers, a simpler but equally powerful alternative to the existing ``hookwrapper=True`` wrappers.
+
+  New-style wrappers are generator functions, similarly to ``hookwrapper``, but do away with the :class:`result <pluggy._callers._Result>` object.
+  Instead, the return value is sent directly to the ``yield`` statement, or, if inner calls raised an exception, it is raised from the ``yield``.
+  The wrapper is expected to return a value or raise an exception, which will become the result of the hook call.
+
+  New-style wrappers are fully interoperable with old-style wrappers.
+  We encourage users to use the new style, however we do not intend to deprecate the old style any time soon.
+
+  See :ref:`hookwrappers` for the full documentation.
+
+
+- `#364 <https://github.com/pytest-dev/pluggy/issues/364>`_: Python 3.11 and 3.12 are now officially supported.
+
+
+- `#394 <https://github.com/pytest-dev/pluggy/issues/394>`_: Added the :meth:`~pluggy._callers._Result.force_exception` method to ``_Result``.
+
+  ``force_exception`` allows (old-style) hookwrappers to force an exception or override/adjust an existing exception of a hook invocation,
+  in a properly behaving manner. Using ``force_exception`` is preferred over raising an exception from the hookwrapper,
+  because raising an exception causes other hookwrappers to be skipped.
+
+
 pluggy 1.0.0 (2021-08-25)
 =========================
 
diff --git a/changelog/260.feature.rst b/changelog/260.feature.rst
deleted file mode 100644
index 8b23d3b3..00000000
--- a/changelog/260.feature.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-Add "new-style" hook wrappers, a simpler but equally powerful alternative to the existing ``hookwrapper=True`` wrappers.
-
-New-style wrappers are generator functions, similarly to ``hookwrapper``, but do away with the :class:`result <pluggy._callers._Result>` object.
-Instead, the return value is sent directly to the ``yield`` statement, or, if inner calls raised an exception, it is raised from the ``yield``.
-The wrapper is excepted to return a value or raise an exception, which will become the result of the hook call.
-
-New-style wrappers are fully interoperable with old-style wrappers.
-We encourage users to use the new style, however we do not intend to deprecate the old style any time soon.
-
-See :ref:`hookwrappers` for the full documentation.
diff --git a/changelog/364.feature.rst b/changelog/364.feature.rst
deleted file mode 100644
index a991347a..00000000
--- a/changelog/364.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Python 3.11 is now officially supported.
diff --git a/changelog/364.removal.rst b/changelog/364.removal.rst
deleted file mode 100644
index 6daecd16..00000000
--- a/changelog/364.removal.rst
+++ /dev/null
@@ -1 +0,0 @@
-Python 3.6 is no longer supported.
diff --git a/changelog/394.feature.rst b/changelog/394.feature.rst
deleted file mode 100644
index a4739a4c..00000000
--- a/changelog/394.feature.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Added the :meth:`~pluggy._callers._Result.force_exception` method to ``_Result``.
-
-``force_exception`` allows hookwrappers to force an exception or override/adjust an existing exception of a hook invocation,
-in a properly behaving manner. Using ``force_exception`` is preferred over raising an exception from the hookwrapper,
-because raising an exception causes other hookwrappers to be skipped.