From 03357116ca954250f40fa6cffe0bccc02da02228 Mon Sep 17 00:00:00 2001
From: Pierre Sassoulas <pierre.sassoulas@gmail.com>
Date: Mon, 2 Oct 2023 18:38:32 +0200
Subject: [PATCH] Bump pylint to 3.1.0-dev0, update changelog

---
 .../contributor_guide/release.rst                | 14 ++++++--------
 doc/whatsnew/3/3.1/index.rst                     | 16 ++++++++++++++++
 doc/whatsnew/3/index.rst                         |  1 +
 pylint/__pkginfo__.py                            |  2 +-
 tbump.toml                                       |  2 +-
 towncrier.toml                                   |  4 ++--
 6 files changed, 27 insertions(+), 12 deletions(-)
 create mode 100644 doc/whatsnew/3/3.1/index.rst

diff --git a/doc/development_guide/contributor_guide/release.rst b/doc/development_guide/contributor_guide/release.rst
index 92b70388a7..2bf0db1619 100644
--- a/doc/development_guide/contributor_guide/release.rst
+++ b/doc/development_guide/contributor_guide/release.rst
@@ -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
@@ -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``)
diff --git a/doc/whatsnew/3/3.1/index.rst b/doc/whatsnew/3/3.1/index.rst
new file mode 100644
index 0000000000..37ddab5759
--- /dev/null
+++ b/doc/whatsnew/3/3.1/index.rst
@@ -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
diff --git a/doc/whatsnew/3/index.rst b/doc/whatsnew/3/index.rst
index 67e4fd06a4..a64c5eca81 100644
--- a/doc/whatsnew/3/index.rst
+++ b/doc/whatsnew/3/index.rst
@@ -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
diff --git a/pylint/__pkginfo__.py b/pylint/__pkginfo__.py
index 770c4710b2..9db81fb544 100644
--- a/pylint/__pkginfo__.py
+++ b/pylint/__pkginfo__.py
@@ -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]:
diff --git a/tbump.toml b/tbump.toml
index 20083fcdb6..3c747af214 100644
--- a/tbump.toml
+++ b/tbump.toml
@@ -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*)
 \.
diff --git a/towncrier.toml b/towncrier.toml
index 3ef3d18f6c..08a78d762c 100644
--- a/towncrier.toml
+++ b/towncrier.toml
@@ -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