From 69cc5f3ede76b7acb9fe5b6d37515bdd1f70ba0d Mon Sep 17 00:00:00 2001 From: Mariatta Date: Wed, 11 Oct 2023 11:32:35 +0200 Subject: [PATCH 1/5] Prepare Changelog for 2.1.1 release --- readme.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/readme.rst b/readme.rst index 6028338..bb97b44 100644 --- a/readme.rst +++ b/readme.rst @@ -367,6 +367,12 @@ in the directory where ``pyproject.toml`` exists: Changelog ========= +2.1.1 +----- + +- Add log messages +- Fix for conflict handling, get the state correctly. (`PR 88 `_) + 2.1.0 ----- From e1a8edc384e48f314dc41328440028ba02fa504e Mon Sep 17 00:00:00 2001 From: Mariatta Date: Wed, 11 Oct 2023 11:33:54 +0200 Subject: [PATCH 2/5] Update the version --- cherry_picker/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cherry_picker/__init__.py b/cherry_picker/__init__.py index bc80576..e5b82ab 100644 --- a/cherry_picker/__init__.py +++ b/cherry_picker/__init__.py @@ -1,2 +1,2 @@ """Backport CPython changes from main to maintenance branches.""" -__version__ = "2.1.0" +__version__ = "2.1.1" From f8d10c22904958bc4d353455db120b20f13e3386 Mon Sep 17 00:00:00 2001 From: Mariatta Date: Wed, 11 Oct 2023 12:53:18 +0200 Subject: [PATCH 3/5] Update changelog to mention dropping Python 3.7 --- readme.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.rst b/readme.rst index 6fea664..c764ccb 100644 --- a/readme.rst +++ b/readme.rst @@ -372,6 +372,7 @@ Changelog - Add log messages - Fix for conflict handling, get the state correctly. (`PR 88 `_) +- Drop support for Python 3.7 (`PR 90 `_) 2.1.0 ----- From 64b3ffd1afd7b05499bcd86b13251de5f98fcb99 Mon Sep 17 00:00:00 2001 From: Mariatta Date: Wed, 11 Oct 2023 12:56:52 +0200 Subject: [PATCH 4/5] Bump to v 2.2.0 --- readme.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.rst b/readme.rst index c764ccb..7724ce5 100644 --- a/readme.rst +++ b/readme.rst @@ -367,7 +367,7 @@ in the directory where ``pyproject.toml`` exists: Changelog ========= -2.1.1 +2.2.0 ----- - Add log messages From c0288736bd3aee4cced3b19d968946388e32d3b5 Mon Sep 17 00:00:00 2001 From: Mariatta Date: Wed, 11 Oct 2023 13:33:57 +0200 Subject: [PATCH 5/5] Bump the version to 2.2.0 --- cherry_picker/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cherry_picker/__init__.py b/cherry_picker/__init__.py index e5b82ab..5636972 100644 --- a/cherry_picker/__init__.py +++ b/cherry_picker/__init__.py @@ -1,2 +1,2 @@ """Backport CPython changes from main to maintenance branches.""" -__version__ = "2.1.1" +__version__ = "2.2.0"