diff --git a/.bumpversion.cfg b/.bumpversion.cfg deleted file mode 100644 index 0d35dbf22..000000000 --- a/.bumpversion.cfg +++ /dev/null @@ -1,19 +0,0 @@ -[bumpversion] -current_version = 3.4.0 -commit = True -message = Release v{new_version} -tag = True -sign_tags = True -tag_name = v{new_version} - -[bumpversion:file:qutebrowser/__init__.py] -parse = __version__ = (?P\d+)\.(?P\d+)\.(?P\d+) - -[bumpversion:file:misc/org.qutebrowser.qutebrowser.appdata.xml] -search = -replace = - - -[bumpversion:file:doc/changelog.asciidoc] -search = (unreleased) -replace = ({now:%Y-%m-%d}) diff --git a/.bumpversion.toml b/.bumpversion.toml new file mode 100644 index 000000000..a0f49b328 --- /dev/null +++ b/.bumpversion.toml @@ -0,0 +1,24 @@ +[tool.bumpversion] +current_version = "3.4.0" +commit = true +message = "Release v{new_version}" +tag = true +sign_tags = true +tag_name = "v{new_version}" +parse = "(?P\\d+)\\.(?P\\d+)\\.(?P\\d+)" +serialize = ["{major}.{minor}.{patch}"] +allow_dirty = true + +[[tool.bumpversion.files]] +filename = "qutebrowser/__init__.py" + +[[tool.bumpversion.files]] +filename = "misc/org.qutebrowser.qutebrowser.appdata.xml" +search = "" +replace = """ +""" + +[[tool.bumpversion.files]] +filename = "doc/changelog.asciidoc" +search = "(unreleased)" +replace = "({now:%Y-%m-%d})" diff --git a/misc/requirements/requirements-dev.txt b/misc/requirements/requirements-dev.txt index a3b72647f..bab5191b9 100644 --- a/misc/requirements/requirements-dev.txt +++ b/misc/requirements/requirements-dev.txt @@ -3,7 +3,7 @@ autocommand==2.2.2 backports.tarfile==1.2.0 build==1.2.2.post1 -bump2version==1.0.1 +bump-my-version==0.30.1 certifi==2024.12.14 cffi==1.17.1 charset-normalizer==3.4.1 diff --git a/misc/requirements/requirements-dev.txt-raw b/misc/requirements/requirements-dev.txt-raw index 8bf0d9772..0db7cb3f4 100644 --- a/misc/requirements/requirements-dev.txt-raw +++ b/misc/requirements/requirements-dev.txt-raw @@ -1,7 +1,7 @@ hunter pympler github3.py -bump2version +bump-my-version requests pyqt-builder build diff --git a/scripts/dev/changelog_urls.json b/scripts/dev/changelog_urls.json index d0db6403e..174d8ef2d 100644 --- a/scripts/dev/changelog_urls.json +++ b/scripts/dev/changelog_urls.json @@ -86,7 +86,7 @@ "pyinstaller-hooks-contrib": "https://github.com/pyinstaller/pyinstaller-hooks-contrib/blob/master/CHANGELOG.rst", "pytest-benchmark": "https://pytest-benchmark.readthedocs.io/en/stable/changelog.html", "docutils": "https://docutils.sourceforge.io/RELEASE-NOTES.html", - "bump2version": "https://github.com/c4urself/bump2version/blob/master/CHANGELOG.md", + "bump-my-version": "https://github.com/callowayproject/bump-my-version/blob/master/CHANGELOG.md", "six": "https://github.com/benjaminp/six/blob/master/CHANGES", "altgraph": "https://github.com/ronaldoussoren/altgraph/blob/master/doc/changelog.rst", "urllib3": "https://github.com/urllib3/urllib3/blob/main/CHANGES.rst", diff --git a/scripts/dev/update_version.py b/scripts/dev/update_version.py index b0f48710e..fa242617f 100644 --- a/scripts/dev/update_version.py +++ b/scripts/dev/update_version.py @@ -6,7 +6,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later -"""Update version numbers using bump2version.""" +"""Update version numbers using bump-my-version.""" import re import sys @@ -45,7 +45,7 @@ def bump_version(version_leap="patch"): version_leap: define the jump between versions ("major", "minor", "patch") """ - subprocess.run([sys.executable, '-m', 'bumpversion', version_leap], + subprocess.run([sys.executable, '-m', 'bumpversion', 'bump', version_leap], check=True)