Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare release #89

Merged
merged 8 commits into from
Oct 11, 2023
Merged

Prepare release #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
69cc5f3
Prepare Changelog for 2.1.1 release
Mariatta Oct 11, 2023
e1a8edc
Update the version
Mariatta Oct 11, 2023
6440b34
Merge branch 'main' into prepare-release
Mariatta Oct 11, 2023
aead5f8
Merge branch 'main' into prepare-release
Mariatta Oct 11, 2023
5143f8a
Merge branch 'main' into prepare-release
Mariatta Oct 11, 2023
f8d10c2
Update changelog to mention dropping Python 3.7
Mariatta Oct 11, 2023
64b3ffd
Bump to v 2.2.0
Mariatta Oct 11, 2023
c028873
Bump the version to 2.2.0
Mariatta Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cherry_picker/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
"""Backport CPython changes from main to maintenance branches."""
__version__ = "2.1.0"
__version__ = "2.2.0"
7 changes: 7 additions & 0 deletions readme.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,13 @@ in the directory where ``pyproject.toml`` exists:
Changelog
=========

2.2.0
-----

- Add log messages
- Fix for conflict handling, get the state correctly. (`PR 88 <https://github.com/python/cherry-picker/pull/88>`_)
- Drop support for Python 3.7 (`PR 90 <https://github.com/python/cherry-picker/pull/90>`_)

2.1.0
-----

Expand Down