From a19bd7ccc8c804f5dbc36dcefe7acf887bef3ccb Mon Sep 17 00:00:00 2001 From: Pierre Sassoulas Date: Tue, 26 Sep 2023 16:04:13 +0200 Subject: [PATCH 1/2] Revert "Bump astroid to 3.1.0-dev0, update changelog" This reverts commit 0ea6d864c55d2841bd909232806ddf406fd1803b. --- astroid/__pkginfo__.py | 2 +- tbump.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/astroid/__pkginfo__.py b/astroid/__pkginfo__.py index ee9bd2e9d2..6c2707620b 100644 --- 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/tbump.toml b/tbump.toml index 6e61fd6b19..35cebfe3e0 100644 --- 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 = ''' ^(?P0|[1-9]\d*) \. From 958ce1ef8bdbb97c8af5902845e501b0866c8b40 Mon Sep 17 00:00:00 2001 From: Pierre Sassoulas Date: Tue, 26 Sep 2023 16:11:12 +0200 Subject: [PATCH 2/2] [doc]Fix following the release of 3.0.0 --- ChangeLog | 2 +- doc/release.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d363f4b606..00813e9a97 100644 --- 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/doc/release.md b/doc/release.md index 73eaaef621..4defdcf155 100644 --- 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