From 536b8ad1231734a2a43b832598437e08a9a7a198 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 21 Nov 2024 07:57:04 -0600
Subject: [PATCH] Release 1.18.0

---
 CHANGES.rst              | 36 ++++++++++++++++++++++++++++++++++++
 CHANGES/111.feature.rst  |  1 -
 CHANGES/1415.contrib.rst |  1 -
 CHANGES/1421.feature.rst |  1 -
 CHANGES/1422.misc.rst    |  1 -
 yarl/__init__.py         |  2 +-
 6 files changed, 37 insertions(+), 5 deletions(-)
 delete mode 120000 CHANGES/111.feature.rst
 delete mode 100644 CHANGES/1415.contrib.rst
 delete mode 100644 CHANGES/1421.feature.rst
 delete mode 100644 CHANGES/1422.misc.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index 7f55ff0d1..b53f18444 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -14,6 +14,42 @@ Changelog
 
 .. towncrier release notes start
 
+1.18.0
+======
+
+*(2024-11-21)*
+
+
+Features
+--------
+
+- Added ``keep_query`` and ``keep_fragment`` flags in the :py:meth:`yarl.URL.with_path`, :py:meth:`yarl.URL.with_name` and :py:meth:`yarl.URL.with_suffix` methods, allowing users to optionally retain the query string and fragment in the resulting URL when replacing the path -- by :user:`paul-nameless`.
+
+  *Related issues and pull requests on GitHub:*
+  :issue:`111`, :issue:`1421`.
+
+
+Contributor-facing changes
+--------------------------
+
+- Started running downstream ``aiohttp`` tests in CI -- by :user:`Cycloctane`.
+
+  *Related issues and pull requests on GitHub:*
+  :issue:`1415`.
+
+
+Miscellaneous internal changes
+------------------------------
+
+- Improved performance of converting :class:`~yarl.URL` to a string -- by :user:`bdraco`.
+
+  *Related issues and pull requests on GitHub:*
+  :issue:`1422`.
+
+
+----
+
+
 1.17.2
 ======
 
diff --git a/CHANGES/111.feature.rst b/CHANGES/111.feature.rst
deleted file mode 120000
index 96c7efc7c..000000000
--- a/CHANGES/111.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-1421.feature.rst
\ No newline at end of file
diff --git a/CHANGES/1415.contrib.rst b/CHANGES/1415.contrib.rst
deleted file mode 100644
index f12c3be00..000000000
--- a/CHANGES/1415.contrib.rst
+++ /dev/null
@@ -1 +0,0 @@
-Started running downstream ``aiohttp`` tests in CI -- by :user:`Cycloctane`.
diff --git a/CHANGES/1421.feature.rst b/CHANGES/1421.feature.rst
deleted file mode 100644
index bb8f7de23..000000000
--- a/CHANGES/1421.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added ``keep_query`` and ``keep_fragment`` flags in the :py:meth:`yarl.URL.with_path`, :py:meth:`yarl.URL.with_name` and :py:meth:`yarl.URL.with_suffix` methods, allowing users to optionally retain the query string and fragment in the resulting URL when replacing the path -- by :user:`paul-nameless`.
diff --git a/CHANGES/1422.misc.rst b/CHANGES/1422.misc.rst
deleted file mode 100644
index 4ab948074..000000000
--- a/CHANGES/1422.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Improved performance of converting :class:`~yarl.URL` to a string -- by :user:`bdraco`.
diff --git a/yarl/__init__.py b/yarl/__init__.py
index 34c42e4f7..539a1ad2e 100644
--- a/yarl/__init__.py
+++ b/yarl/__init__.py
@@ -1,7 +1,7 @@
 from ._query import Query, QueryVariable, SimpleQuery
 from ._url import URL, cache_clear, cache_configure, cache_info
 
-__version__ = "1.18.0.dev0"
+__version__ = "1.18.0"
 
 __all__ = (
     "URL",