Merge pull request #2311 from pylint-dev/fix-maintenance-branch

Fix 3.0.x maintenance branch
pylint-dev · Sep 26, 2023 · 1f57444 · 1f57444
2 parents 0883b04 + 958ce1e
commit 1f57444
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -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.
 

diff --git a/astroid/__pkginfo__.py b/astroid/__pkginfo__.py
@@ -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__
diff --git a/doc/release.md b/doc/release.md
@@ -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
 

diff --git a/tbump.toml b/tbump.toml
@@ -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*)
 \.