Skip to content

Commit

Permalink
Bump astroid to 2.13.0, update changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
Pierre-Sassoulas committed Jan 7, 2023
1 parent 2323ee6 commit 1d49b8c
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 10 deletions.
14 changes: 13 additions & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,22 @@
astroid's ChangeLog
===================

What's New in astroid 2.13.0?
What's New in astroid 2.14.0?
=============================
Release date: TBA



What's New in astroid 2.13.1?
=============================
Release date: TBA



What's New in astroid 2.13.0?
=============================
Release date: 2023-01-07

* Fixed importing of modules that have the same name as the file that is importing.
``astroid`` will now correctly handle an ``import math`` statement in a file called ``math.py``
by relying on the import system.
Expand Down
2 changes: 1 addition & 1 deletion astroid/__pkginfo__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
# For details: https://github.com/PyCQA/astroid/blob/main/LICENSE
# Copyright (c) https://github.com/PyCQA/astroid/blob/main/CONTRIBUTORS.txt

__version__ = "2.13.0-dev0"
__version__ = "2.13.0"
version = __version__
21 changes: 14 additions & 7 deletions doc/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,20 @@ Check the commit and then push to a release branch

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

Whenever a commit on `main` should be released in a patch release on the current
maintenance branch we cherry-pick the commit from `main`.

- During the merge request on `main`, make sure that the changelog is for the patch
version `X.Y-1.Z'`. (For example: `v2.3.5`)
- After the PR is merged on `main` cherry-pick the commits on the `maintenance/X.Y.x`
branch (For example: from `maintenance/2.4.x` cherry-pick a commit from `main`)
Whenever a PR on `main` should be released in a patch release on the current maintenance
branch:

- Label the PR with `backport maintenance/X.Y-1.x`. (For example
`backport maintenance/2.3.x`)
- Squash the PR before merging (alternatively rebase if there's a single commit)
- (If the automated cherry-pick has conflicts)
- Add a `Needs backport` label and do it manually.
- You might alternatively also:
- Cherry-pick the changes that create the conflict if it's not a new feature before
doing the original PR cherry-pick manually.
- Decide to wait for the next minor to release the PR
- In any case upgrade the milestones in the original PR and newly cherry-picked PR
to match reality.
- Release a patch version

## Releasing a patch version
Expand Down
2 changes: 1 addition & 1 deletion tbump.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github_url = "https://github.com/PyCQA/astroid"

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

0 comments on commit 1d49b8c

Please sign in to comment.