From 24b9a043a8c0b263c60a63306c3a71080a839ab8 Mon Sep 17 00:00:00 2001
From: David Hewitt <mail@davidhewitt.dev>
Date: Tue, 15 Oct 2024 22:23:09 +0100
Subject: [PATCH] release: 0.22.5 (#4624)

---
 CHANGELOG.md                                           | 10 +++++++++-
 README.md                                              |  4 ++--
 examples/decorator/.template/pre-script.rhai           |  2 +-
 examples/maturin-starter/.template/pre-script.rhai     |  2 +-
 examples/plugin/.template/pre-script.rhai              |  2 +-
 .../setuptools-rust-starter/.template/pre-script.rhai  |  2 +-
 examples/word-count/.template/pre-script.rhai          |  2 +-
 newsfragments/4619.fixed.md                            |  1 -
 8 files changed, 16 insertions(+), 9 deletions(-)
 delete mode 100644 newsfragments/4619.fixed.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e6c1392eb2..34727da8b24 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,13 @@ To see unreleased changes, please see the [CHANGELOG on the main branch guide](h
 
 <!-- towncrier release notes start -->
 
+## [0.22.5] - 2024-10-15
+
+### Fixed
+
+- Fix regression in 0.22.4 of naming collision in `__clear__` slot and `clear` method generated code. [#4619](https://github.com/PyO3/pyo3/pull/4619)
+
+
 ## [0.22.4] - 2024-10-12
 
 ### Added
@@ -1892,7 +1899,8 @@ Yanked
 
 - Initial release
 
-[Unreleased]: https://github.com/pyo3/pyo3/compare/v0.22.4...HEAD
+[Unreleased]: https://github.com/pyo3/pyo3/compare/v0.22.5...HEAD
+[0.22.5]: https://github.com/pyo3/pyo3/compare/v0.22.4...v0.22.5
 [0.22.4]: https://github.com/pyo3/pyo3/compare/v0.22.3...v0.22.4
 [0.22.3]: https://github.com/pyo3/pyo3/compare/v0.22.2...v0.22.3
 [0.22.2]: https://github.com/pyo3/pyo3/compare/v0.22.1...v0.22.2
diff --git a/README.md b/README.md
index 051f35a5d28..7120e626cd5 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ name = "string_sum"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = { version = "0.22.4", features = ["extension-module"] }
+pyo3 = { version = "0.22.5", features = ["extension-module"] }
 ```
 
 **`src/lib.rs`**
@@ -140,7 +140,7 @@ Start a new project with `cargo new` and add  `pyo3` to the `Cargo.toml` like th
 
 ```toml
 [dependencies.pyo3]
-version = "0.22.4"
+version = "0.22.5"
 features = ["auto-initialize"]
 ```
 
diff --git a/examples/decorator/.template/pre-script.rhai b/examples/decorator/.template/pre-script.rhai
index 29b5f4d09c5..3f9199c0f2f 100644
--- a/examples/decorator/.template/pre-script.rhai
+++ b/examples/decorator/.template/pre-script.rhai
@@ -1,4 +1,4 @@
-variable::set("PYO3_VERSION", "0.22.4");
+variable::set("PYO3_VERSION", "0.22.5");
 file::rename(".template/Cargo.toml", "Cargo.toml");
 file::rename(".template/pyproject.toml", "pyproject.toml");
 file::delete(".template");
diff --git a/examples/maturin-starter/.template/pre-script.rhai b/examples/maturin-starter/.template/pre-script.rhai
index 29b5f4d09c5..3f9199c0f2f 100644
--- a/examples/maturin-starter/.template/pre-script.rhai
+++ b/examples/maturin-starter/.template/pre-script.rhai
@@ -1,4 +1,4 @@
-variable::set("PYO3_VERSION", "0.22.4");
+variable::set("PYO3_VERSION", "0.22.5");
 file::rename(".template/Cargo.toml", "Cargo.toml");
 file::rename(".template/pyproject.toml", "pyproject.toml");
 file::delete(".template");
diff --git a/examples/plugin/.template/pre-script.rhai b/examples/plugin/.template/pre-script.rhai
index ee4c26ae8b3..1d2e4657033 100644
--- a/examples/plugin/.template/pre-script.rhai
+++ b/examples/plugin/.template/pre-script.rhai
@@ -1,4 +1,4 @@
-variable::set("PYO3_VERSION", "0.22.4");
+variable::set("PYO3_VERSION", "0.22.5");
 file::rename(".template/Cargo.toml", "Cargo.toml");
 file::rename(".template/plugin_api/Cargo.toml", "plugin_api/Cargo.toml");
 file::delete(".template");
diff --git a/examples/setuptools-rust-starter/.template/pre-script.rhai b/examples/setuptools-rust-starter/.template/pre-script.rhai
index e743211006c..9a92b25c613 100644
--- a/examples/setuptools-rust-starter/.template/pre-script.rhai
+++ b/examples/setuptools-rust-starter/.template/pre-script.rhai
@@ -1,4 +1,4 @@
-variable::set("PYO3_VERSION", "0.22.4");
+variable::set("PYO3_VERSION", "0.22.5");
 file::rename(".template/Cargo.toml", "Cargo.toml");
 file::rename(".template/setup.cfg", "setup.cfg");
 file::delete(".template");
diff --git a/examples/word-count/.template/pre-script.rhai b/examples/word-count/.template/pre-script.rhai
index 29b5f4d09c5..3f9199c0f2f 100644
--- a/examples/word-count/.template/pre-script.rhai
+++ b/examples/word-count/.template/pre-script.rhai
@@ -1,4 +1,4 @@
-variable::set("PYO3_VERSION", "0.22.4");
+variable::set("PYO3_VERSION", "0.22.5");
 file::rename(".template/Cargo.toml", "Cargo.toml");
 file::rename(".template/pyproject.toml", "pyproject.toml");
 file::delete(".template");
diff --git a/newsfragments/4619.fixed.md b/newsfragments/4619.fixed.md
deleted file mode 100644
index c0ff9dbb16a..00000000000
--- a/newsfragments/4619.fixed.md
+++ /dev/null
@@ -1 +0,0 @@
-fixed `__clear__` slot naming collision with `clear` method
\ No newline at end of file