diff options
| -rw-r--r-- | .github/workflows/ci.yaml | 2 | ||||
| -rw-r--r-- | CONTRIBUTORS.txt | 3 | ||||
| -rw-r--r-- | ChangeLog | 19 | ||||
| -rw-r--r-- | astroid/__pkginfo__.py | 2 | ||||
| -rw-r--r-- | doc/release.md | 19 | ||||
| -rw-r--r-- | requirements_test.txt | 2 | ||||
| -rw-r--r-- | tbump.toml | 4 |
7 files changed, 31 insertions, 20 deletions
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e2eed70e..c5fd39d8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,7 +8,7 @@ on: pull_request: ~ env: - CACHE_VERSION: 4 + CACHE_VERSION: 5 DEFAULT_PYTHON: 3.8 PRE_COMMIT_CACHE: ~/.cache/pre-commit diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 1c96ba33..23098537 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -7,7 +7,7 @@ Maintainers - Claudiu Popa <pcmanticore@gmail.com> - Sylvain Thénault <thenault@gmail.com> - Pierre Sassoulas <pierre.sassoulas@gmail.com> -- hippo91 <guillaume.peillex@gmail.com> +- Hippo91 <guillaume.peillex@gmail.com> - Marc Mueller <30130371+cdce8p@users.noreply.github.com> - Daniël van Noord <13665637+DanielNoord@users.noreply.github.com> - Bryce Guinta <bryce.paul.guinta@gmail.com> @@ -140,6 +140,7 @@ Contributors - Dmitry Shachnev <mitya57@users.noreply.github.com> - Denis Laxalde <denis.laxalde@logilab.fr> - David Poirier <david-poirier-csn@users.noreply.github.com> +- Dave Hirschfeld <dave.hirschfeld@gmail.com> - Dave Baum <dbaum@google.com> - Daniel Martin <daniel.martin@crowdstrike.com> - Daniel Colascione <dancol@dancol.org> @@ -2,10 +2,22 @@ astroid's ChangeLog =================== -What's New in astroid 2.11.0? +What's New in astroid 2.12.0? +============================= +Release date: TBA + + + +What's New in astroid 2.11.1? ============================= Release date: TBA + + +What's New in astroid 2.11.0? +============================= +Release date: 2022-03-12 + * Add new (optional) ``doc_node`` attribute to ``nodes.Module``, ``nodes.ClassDef``, and ``nodes.FunctionDef``. @@ -35,11 +47,6 @@ Release date: TBA * Only pin ``wrapt`` on the major version. -What's New in astroid 2.10.1? -============================= -Release date: TBA - - What's New in astroid 2.10.0? ============================= Release date: 2022-02-27 diff --git a/astroid/__pkginfo__.py b/astroid/__pkginfo__.py index ca90a6ae..696cc9cd 100644 --- a/astroid/__pkginfo__.py +++ b/astroid/__pkginfo__.py @@ -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.10.1-dev0" +__version__ = "2.11.0" version = __version__ diff --git a/doc/release.md b/doc/release.md index 3477b4a4..9052927b 100644 --- a/doc/release.md +++ b/doc/release.md @@ -13,13 +13,9 @@ the maintenance branch. If so, release a last patch release first. See - Check the result of `git diff vX.Y-1.Z' ChangeLog`. (For example: `git diff v2.3.4 ChangeLog`) - Install the release dependencies: `pip3 install -r requirements_test.txt` -- Bump the version and release by using `tbump X.Y.0 --no-push`. (For example: - `tbump 2.4.0 --no-push`) -- Check the result visually and then by triggering the "release tests" workflow in - GitHub Actions first. -- Push the tag. -- Release the version on GitHub with the same name as the tag and copy and paste the - appropriate changelog in the description. This triggers the PyPI release. +- Bump the version and release by using `tbump X.Y.0 --no-push --no-tag`. (For example: + `tbump 2.4.0 --no-push --no-tag`) +- Check the commit created with `git show` amend the commit if required. - Move the `main` branch up to a dev version with `tbump`: ```bash @@ -34,8 +30,15 @@ tbump 2.5.0-dev0 --no-tag --no-push git commit -am "Upgrade the version to 2.5.0-dev0 following 2.4.0 release" ``` -Check the result and then upgrade the main branch +Check the commit and then push to a release branch +- Open a merge request with the two commits (no one can push directly on `main`) +- Trigger the "release tests" workflow in GitHub Actions. +- After the merge, recover the merged commits on `main` and tag the first one (the + version should be `X.Y.Z`) as `vX.Y.Z` (For example: `v2.4.0`) +- Push the tag. +- Release the version on GitHub with the same name as the tag and copy and paste the + 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.) diff --git a/requirements_test.txt b/requirements_test.txt index 354bf7bf..3fdf820f 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -5,6 +5,6 @@ coverage~=5.5 pre-commit~=2.17 pytest-cov~=3.0 tbump~=6.3.2 -contributors-txt~=0.5.1 +contributors-txt~=0.5.2 types-typed-ast; implementation_name=="cpython" and python_version<"3.8" types-pkg_resources==0.1.3 @@ -1,7 +1,7 @@ github_url = "https://github.com/PyCQA/astroid" [version] -current = "2.10.1-dev0" +current = "2.11.0" regex = ''' ^(?P<major>0|[1-9]\d*) \. @@ -30,7 +30,7 @@ cmd = "python3 script/bump_changelog.py {new_version}" [[before_commit]] name = "Normalize the contributors-txt configuration" -cmd = "contributors-txt-normalize-confinguration -a script/.contributors_aliases.json -o script/.contributors_aliases.json" +cmd = "contributors-txt-normalize-configuration -a script/.contributors_aliases.json -o script/.contributors_aliases.json" [[before_commit]] name = "Upgrade the contributors list" |