Skip to content

Commit

Permalink
Bump pylint to 3.1.0-dev0, update changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
Pierre-Sassoulas committed Oct 2, 2023
1 parent 6f874fd commit c61edea
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 12 deletions.
14 changes: 6 additions & 8 deletions doc/development_guide/contributor_guide/release.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ patch release first. See ``Releasing a patch version``.**
``tbump 2.4.0 --no-push --no-tag``)
- Check the commit created with ``git show`` amend the commit if
required.
- Create a new ``What's new in Pylint X.Y+1`` document. Add it to
``doc/index.rst``. Take a look at the examples from ``doc/whatsnew``.
Commit that with ``git commit -am "wip"``.
- Move the ``main`` branch up to a dev version with ``tbump``:

.. code:: bash
Expand All @@ -36,11 +33,12 @@ For example:
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 commit, fixup the ‘wip’ commit with the what’s new then push
to a release branch

- Open a merge request with the two commits (no one can push directly
on ``main``)
- tbump will have created a new ``What's new in Pylint X.Y+1`` document.
Add it to ``doc/whatsnew/3/index.rst``. Take a look at the examples from ``doc/whatsnew``.
Commit that with ``git commit -a --amend``.
- Push to a release branch
- Open a merge request with the two commits (no one can push directly
on ``main``)
- 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``)
Expand Down
16 changes: 16 additions & 0 deletions doc/whatsnew/3/3.1/index.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@

***************************
What's New in Pylint 3.1
***************************

.. toctree::
:maxdepth: 2

:Release:3.1
:Date: TBA

Summary -- Release highlights
=============================


.. towncrier release notes start
1 change: 1 addition & 0 deletions doc/whatsnew/3/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ This is the full list of change in pylint 3.x minors, by categories.
.. toctree::
:maxdepth: 2

3.1/index
3.0/index
2 changes: 1 addition & 1 deletion pylint/__pkginfo__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

from __future__ import annotations

__version__ = "3.0.0"
__version__ = "3.1.0-dev0"


def get_numversion_from_version(v: str) -> tuple[int, int, int]:
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/pylint-dev/pylint"

[version]
current = "3.0.0"
current = "3.1.0-dev0"
regex = '''
^(?P<major>0|[1-9]\d*)
\.
Expand Down
4 changes: 2 additions & 2 deletions towncrier.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[tool.towncrier]
version = "3.0.0"
version = "3.1.0"
directory = "doc/whatsnew/fragments"
filename = "doc/whatsnew/3/3.0/index.rst"
filename = "doc/whatsnew/3/3.1/index.rst"
template = "doc/whatsnew/fragments/_template.rst"
issue_format = "`#{issue} <https://github.com/pylint-dev/pylint/issues/{issue}>`_"
wrap = false # doesn't wrap links correctly if beginning with indentation
Expand Down

0 comments on commit c61edea

Please sign in to comment.