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

Jump to bottom

Fix 3.0.x maintenance branch #2311

Merged
merged 2 commits into from
Sep 26, 2023
Merged

Fix 3.0.x maintenance branch #2311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a19bd7c
Revert "Bump astroid to 3.1.0-dev0, update changelog"
Pierre-Sassoulas Sep 26, 2023
958ce1e
[doc]Fix following the release of 3.0.0
Pierre-Sassoulas Sep 26, 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 ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Release date: TBA

What's New in astroid 3.0.0?
=============================
Release date: 2023-09-25
Release date: 2023-09-26

* Add support for Python 3.12, including PEP 695 type parameter syntax.

Expand Down
2 changes: 1 addition & 1 deletion astroid/__pkginfo__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
# For details: https://github.com/pylint-dev/astroid/blob/main/LICENSE
# Copyright (c) https://github.com/pylint-dev/astroid/blob/main/CONTRIBUTORS.txt

__version__ = "3.1.0-dev0"
__version__ = "3.0.0"
version = __version__
2 changes: 2 additions & 0 deletions doc/release.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ Check the commit and then push to a release branch
appropriate changelog in the description. This triggers the PyPI release.
- Delete the `maintenance/X.Y-1.x` branch. (For example: `maintenance/2.3.x`)
- Create a `maintenance/X.Y.x` (For example: `maintenance/2.4.x` from the `v2.4.0` tag.)
based on the tag from the release. The maintenance branch are protected you won't be
able to fix it after the fact if you create it from main.

## Backporting a fix from `main` to the maintenance branch

Expand Down
2 changes: 1 addition & 1 deletion tbump.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github_url = "https://github.com/pylint-dev/astroid"

[version]
current = "3.1.0-dev0"
current = "3.0.0"
regex = '''
^(?P<major>0|[1-9]\d*)
\.
Expand Down