From 428d5fc54bfe0909600f58cf35324abb6e182777 Mon Sep 17 00:00:00 2001 From: Andrew Svetlov Date: Tue, 24 Jun 2025 20:29:32 +0200 Subject: [PATCH 1/6] Release 6.5.1 --- CHANGES.rst | 46 ++++++++++++++++++++++++++++++++++++++++ CHANGES/1123.contrib | 1 - CHANGES/1192.contrib | 3 --- CHANGES/1193.contrib.rst | 3 --- CHANGES/1195.bugfix.rst | 6 ------ multidict/__init__.py | 2 +- 6 files changed, 47 insertions(+), 14 deletions(-) delete mode 100644 CHANGES/1123.contrib delete mode 100644 CHANGES/1192.contrib delete mode 100644 CHANGES/1193.contrib.rst delete mode 100644 CHANGES/1195.bugfix.rst diff --git a/CHANGES.rst b/CHANGES.rst index 8e59e2f6a..83876487f 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -14,6 +14,52 @@ Changelog .. towncrier release notes start +6.5.1 +===== + +*(2025-06-24)* + + +Bug fixes +--------- + +- Fix a bug in C implementation when during multidict resizing the function could drop + last item under some circumstances. + + The bug was introduced by multidict 6.5.0 release. + + Patch by :user:`asvetlov`. + + *Related issues and pull requests on GitHub:* + :issue:`1195`. + + +Contributor-facing changes +-------------------------- + +- Setup pre-commit hook for auto-formatting both Python and C code. + + *Related issues and pull requests on GitHub:* + :issue:`1123`. + +- Shorted fixture parametrization ids. + + For example, ``test_keys_view_xor[case-insensitive-pure-python-module]`` becomes ``test_keys_view_xor[ci-py]`` -- by :user:`asvetlov`. + + *Related issues and pull requests on GitHub:* + :issue:`1192`. + +- The :file:`reusable-cibuildwheel.yml` workflow has been refactored to + be more generic and :file:`ci-cd.yml` now holds all the configuration + toggles -- by :user:`webknjaz`. + + *Related issues and pull requests on GitHub:* + :issue:`1193`. + + +---- + + 6.5.0 ===== diff --git a/CHANGES/1123.contrib b/CHANGES/1123.contrib deleted file mode 100644 index cf70c218b..000000000 --- a/CHANGES/1123.contrib +++ /dev/null @@ -1 +0,0 @@ -Setup pre-commit hook for auto-formatting both Python and C code. diff --git a/CHANGES/1192.contrib b/CHANGES/1192.contrib deleted file mode 100644 index 541d7fe4f..000000000 --- a/CHANGES/1192.contrib +++ /dev/null @@ -1,3 +0,0 @@ -Shorted fixture parametrization ids. - -For example, ``test_keys_view_xor[case-insensitive-pure-python-module]`` becomes ``test_keys_view_xor[ci-py]`` -- by :user:`asvetlov`. diff --git a/CHANGES/1193.contrib.rst b/CHANGES/1193.contrib.rst deleted file mode 100644 index 0fd747e6a..000000000 --- a/CHANGES/1193.contrib.rst +++ /dev/null @@ -1,3 +0,0 @@ -The :file:`reusable-cibuildwheel.yml` workflow has been refactored to -be more generic and :file:`ci-cd.yml` now holds all the configuration -toggles -- by :user:`webknjaz`. diff --git a/CHANGES/1195.bugfix.rst b/CHANGES/1195.bugfix.rst deleted file mode 100644 index 1001d4279..000000000 --- a/CHANGES/1195.bugfix.rst +++ /dev/null @@ -1,6 +0,0 @@ -Fix a bug in C implementation when during multidict resizing the function could drop -last item under some circumstances. - -The bug was introduced by multidict 6.5.0 release. - -Patch by :user:`asvetlov`. diff --git a/multidict/__init__.py b/multidict/__init__.py index 51a9ccc33..1d8a2ae54 100644 --- a/multidict/__init__.py +++ b/multidict/__init__.py @@ -22,7 +22,7 @@ "getversion", ) -__version__ = "6.5.1.dev0" +__version__ = "6.5.1" if TYPE_CHECKING or not USE_EXTENSIONS: From c3b84f4463867a37916b9b6584a99864d29f1270 Mon Sep 17 00:00:00 2001 From: Andrew Svetlov Date: Tue, 24 Jun 2025 20:41:23 +0200 Subject: [PATCH 2/6] Apply suggestions from code review --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 83876487f..3e813efff 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -23,7 +23,7 @@ Changelog Bug fixes --------- -- Fix a bug in C implementation when during multidict resizing the function could drop +- Fixed a bug in C implementation when during multidict resizing the function could drop last item under some circumstances. The bug was introduced by multidict 6.5.0 release. From 916d527409d220bb4bb57de424db5f43b5ddf006 Mon Sep 17 00:00:00 2001 From: Andrew Svetlov Date: Tue, 24 Jun 2025 20:52:06 +0200 Subject: [PATCH 3/6] Update CHANGES.rst MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 🇺🇦 Sviatoslav Sydorenko (Святослав Сидоренко) --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 3e813efff..d7981f5ca 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -37,7 +37,7 @@ Bug fixes Contributor-facing changes -------------------------- -- Setup pre-commit hook for auto-formatting both Python and C code. +- A pair of code formatters for Python and C have been configured in the pre-commit tool. *Related issues and pull requests on GitHub:* :issue:`1123`. From 929da4b4f31f13456253d49ae494e6aaf2e87903 Mon Sep 17 00:00:00 2001 From: Andrew Svetlov Date: Tue, 24 Jun 2025 20:54:12 +0200 Subject: [PATCH 4/6] fix --- docs/spelling_wordlist.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt index d422de0f2..a40068ed0 100644 --- a/docs/spelling_wordlist.txt +++ b/docs/spelling_wordlist.txt @@ -36,6 +36,7 @@ eof fallback fastpath filename +formatters gcc getitem github From f9d90e2104b827ad9311f40d694ce5b23f99a8fc Mon Sep 17 00:00:00 2001 From: Andrew Svetlov Date: Tue, 24 Jun 2025 22:37:34 +0200 Subject: [PATCH 5/6] Update CHANGES.rst --- CHANGES.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index d7981f5ca..3a22df0fd 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -23,8 +23,7 @@ Changelog Bug fixes --------- -- Fixed a bug in C implementation when during multidict resizing the function could drop - last item under some circumstances. +- Fixed a bug in C implementation when multidict is resized and it has deleted slots. The bug was introduced by multidict 6.5.0 release. From d3f8a85658c3e7a11328e14cd26d8b20734d9dfa Mon Sep 17 00:00:00 2001 From: Andrew Svetlov Date: Tue, 24 Jun 2025 22:57:38 +0200 Subject: [PATCH 6/6] update-changes --- CHANGES.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 3a22df0fd..b143467a8 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -64,6 +64,11 @@ Contributor-facing changes *(2025-06-17)* +.. note:: + + The release was yanked because of :issue:`1195`, multidict 6.5.1 should be used + instead. + Features --------