From d465ec5542a611ffefab45736859f37b0b251eb8 Mon Sep 17 00:00:00 2001
From: Sydney Runkle <54324534+sydney-runkle@users.noreply.github.com>
Date: Mon, 13 Nov 2023 10:26:10 -0600
Subject: [PATCH] `v2.5.0` release (#8091)

---
 HISTORY.md              | 11 +++++++++--
 pydantic/version.py     |  2 +-
 release/make_history.py |  5 +++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index aba517a6e3..f401536bcb 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,12 +1,15 @@
-## v2.5.0b1 (2023-11-09)
+## v2.5.0 (2023-11-13)
+
+[GitHub release](https://github.com/pydantic/pydantic/releases/tag/v2.5.0)
 
-[GitHub release](https://github.com/pydantic/pydantic/releases/tag/v2.5.0b1)
+The code released in v2.5.0 is functionally identical to that of v2.5.0b1.
 
 ### What's Changed
 
 #### Packaging
 
 * Update pydantic-core from 2.10.1 to 2.14.1, significant changes from these updates are described below, full changelog [here](https://github.com/pydantic/pydantic-core/compare/v2.10.1...v2.14.1)
+* Update to `pyright==1.1.335` by @Viicos in [#8075](https://github.com/pydantic/pydantic/pull/8075)
 
 #### New Features
 
@@ -116,6 +119,10 @@
 * @sisp made their first contribution in [pydantic/pydantic-core#995](https://github.com/pydantic/pydantic-core/pull/995)
 * @michaelhly made their first contribution in [pydantic/pydantic-core#1015](https://github.com/pydantic/pydantic-core/pull/1015)
 
+## v2.5.0b1 (2023-11-09)
+
+Pre-release, see [the GitHub release](https://github.com/pydantic/pydantic/releases/tag/v2.5.0b1) for details.
+
 ## v2.4.2 (2023-09-27)
 
 [GitHub release](https://github.com/pydantic/pydantic/releases/tag/v2.4.2)
diff --git a/pydantic/version.py b/pydantic/version.py
index 5546ee709a..1daa7e09e8 100644
--- a/pydantic/version.py
+++ b/pydantic/version.py
@@ -3,7 +3,7 @@
 
 __all__ = 'VERSION', 'version_info'
 
-VERSION = '2.5.0b1'
+VERSION = '2.5.0'
 """The version of Pydantic."""
 
 
diff --git a/release/make_history.py b/release/make_history.py
index b810126d67..199acf4704 100644
--- a/release/make_history.py
+++ b/release/make_history.py
@@ -28,7 +28,8 @@ def main():
     history_path = root_dir / 'HISTORY.md'
     history_content = history_path.read_text()
 
-    if f'## v{new_version}' in history_content:
+    # use ( to avoid matching beta versions
+    if f'## v{new_version} (' in history_content:
         print(f'WARNING: v{new_version} already in history, stopping')
         sys.exit(1)
 
@@ -65,7 +66,7 @@ def get_notes(new_version: str) -> str:
     response.raise_for_status()
 
     body = response.json()['body']
-    body = body.removeprefix('<!-- Release notes generated using configuration in .github/release.yml at main -->\n\n')
+    body = body.replace('<!-- Release notes generated using configuration in .github/release.yml at main -->\n\n', "")
 
     # Add one level to all headers so they match HISTORY.md, and add trailing newline
     body = re.sub(pattern='^(#+ .+?)$', repl=r'#\1\n', string=body, flags=re.MULTILINE)