Skip to content

Commit 1d49b8c

Browse files
Bump astroid to 2.13.0, update changelog
1 parent 2323ee6 commit 1d49b8c

File tree

4 files changed

+29
-10
lines changed

4 files changed

+29
-10
lines changed

ChangeLog

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,22 @@
22
astroid's ChangeLog
33
===================
44

5-
What's New in astroid 2.13.0?
5+
What's New in astroid 2.14.0?
6+
=============================
7+
Release date: TBA
8+
9+
10+
11+
What's New in astroid 2.13.1?
612
=============================
713
Release date: TBA
814

15+
16+
17+
What's New in astroid 2.13.0?
18+
=============================
19+
Release date: 2023-01-07
20+
921
* Fixed importing of modules that have the same name as the file that is importing.
1022
``astroid`` will now correctly handle an ``import math`` statement in a file called ``math.py``
1123
by relying on the import system.

astroid/__pkginfo__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# For details: https://github.com/PyCQA/astroid/blob/main/LICENSE
33
# Copyright (c) https://github.com/PyCQA/astroid/blob/main/CONTRIBUTORS.txt
44

5-
__version__ = "2.13.0-dev0"
5+
__version__ = "2.13.0"
66
version = __version__

doc/release.md

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,20 @@ Check the commit and then push to a release branch
4444

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

47-
Whenever a commit on `main` should be released in a patch release on the current
48-
maintenance branch we cherry-pick the commit from `main`.
49-
50-
- During the merge request on `main`, make sure that the changelog is for the patch
51-
version `X.Y-1.Z'`. (For example: `v2.3.5`)
52-
- After the PR is merged on `main` cherry-pick the commits on the `maintenance/X.Y.x`
53-
branch (For example: from `maintenance/2.4.x` cherry-pick a commit from `main`)
47+
Whenever a PR on `main` should be released in a patch release on the current maintenance
48+
branch:
49+
50+
- Label the PR with `backport maintenance/X.Y-1.x`. (For example
51+
`backport maintenance/2.3.x`)
52+
- Squash the PR before merging (alternatively rebase if there's a single commit)
53+
- (If the automated cherry-pick has conflicts)
54+
- Add a `Needs backport` label and do it manually.
55+
- You might alternatively also:
56+
- Cherry-pick the changes that create the conflict if it's not a new feature before
57+
doing the original PR cherry-pick manually.
58+
- Decide to wait for the next minor to release the PR
59+
- In any case upgrade the milestones in the original PR and newly cherry-picked PR
60+
to match reality.
5461
- Release a patch version
5562

5663
## Releasing a patch version

tbump.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
github_url = "https://github.com/PyCQA/astroid"
22

33
[version]
4-
current = "2.13.0-dev0"
4+
current = "2.13.0"
55
regex = '''
66
^(?P<major>0|[1-9]\d*)
77
\.

0 commit comments

Comments
 (0)