From fc6ac6aa9f55b742bd0815e0ace254a24f065b3a Mon Sep 17 00:00:00 2001 From: Mariatta Date: Tue, 21 Aug 2018 09:41:14 -0700 Subject: [PATCH 1/2] cherry-picker 1.2.1 release --- cherry_picker/cherry_picker/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cherry_picker/cherry_picker/__init__.py b/cherry_picker/cherry_picker/__init__.py index a45b2c4..4ac7e95 100644 --- a/cherry_picker/cherry_picker/__init__.py +++ b/cherry_picker/cherry_picker/__init__.py @@ -1,2 +1,2 @@ """Backport CPython changes from master to maintenance branches.""" -__version__ = '1.2.1.dev1' +__version__ = '1.2.1' From c45922ffecf12112e29ff33848a9fb48b7002c09 Mon Sep 17 00:00:00 2001 From: Mariatta Date: Tue, 21 Aug 2018 09:47:17 -0700 Subject: [PATCH 2/2] Set v 1.2.1 in readme --- cherry_picker/readme.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cherry_picker/readme.rst b/cherry_picker/readme.rst index f5a94f5..43d0746 100644 --- a/cherry_picker/readme.rst +++ b/cherry_picker/readme.rst @@ -339,8 +339,8 @@ in the directory where ``pyproject.toml`` exists:: Changelog ========= -1.2.1 (in development) ------------------------ +1.2.1 +----- - Validate the branch name to operate on with ``--continue`` and fail early if the branch could not have been created by cherry_picker. (`PR #266 `_).