From 667367eae01686d3dbf2499a810cba3b599cc3eb Mon Sep 17 00:00:00 2001 From: gmuloc Date: Wed, 19 Jul 2023 15:19:45 +0200 Subject: [PATCH] chore: Replace bumpversion with bumpver --- .bumpversion.cfg | 20 ----------------- anta/__init__.py | 2 +- docs/requirements-and-installation.md | 2 +- pyproject.toml | 32 +++++++++++++++------------ 4 files changed, 20 insertions(+), 36 deletions(-) delete mode 100644 .bumpversion.cfg diff --git a/.bumpversion.cfg b/.bumpversion.cfg deleted file mode 100644 index 42ccd7892..000000000 --- a/.bumpversion.cfg +++ /dev/null @@ -1,20 +0,0 @@ -[bumpversion] -current_version = 0.6.0 -commit = True -tag = True -parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+))? -serialize = - {major}.{minor}.{patch}-{release} - {major}.{minor}.{patch} - -[bumpversion:part:build] -first_value = 1 - -[bumpversion:file:anta/__init__.py] - -[bumpversion:part:release] -optional_value = gamma -values = - dev - beta - gamma diff --git a/anta/__init__.py b/anta/__init__.py index c87b71567..16ab8649f 100644 --- a/anta/__init__.py +++ b/anta/__init__.py @@ -4,7 +4,7 @@ import importlib.metadata import os -__version__ = importlib.metadata.version("anta") +__version__ = f"v{importlib.metadata.version('anta')}" __credits__ = [ "Angélique Phillipps", "Colin MacGiollaEáin", diff --git a/docs/requirements-and-installation.md b/docs/requirements-and-installation.md index 077088063..092962b92 100644 --- a/docs/requirements-and-installation.md +++ b/docs/requirements-and-installation.md @@ -50,7 +50,7 @@ which anta # Chck ANTA version anta --version -anta, version 0.6.0 +anta, version v0.6.0 ``` ## EOS Requirements diff --git a/pyproject.toml b/pyproject.toml index ac3948e9e..b5be72f80 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -50,7 +50,7 @@ requires-python = ">=3.8" [project.optional-dependencies] dev = [ - "bump2version==1.0.1", + "bumpver==2023.1125", "black==23.3.0", "flake8==6.0.0", "isort==5.10.1", @@ -71,19 +71,6 @@ dev = [ "typing-extensions", "yamllint", ] -doc = [ - "mkdocs>=1.3.1", - "mkdocs-autorefs>=0.4.1", - "mkdocs-bootswatch>=1.1", - "mkdocs-git-revision-date-localized-plugin>=1.1.0", - "mkdocs-git-revision-date-plugin>=0.3.2", - "mkdocs-material>=8.3.9", - "mkdocs-material-extensions>=1.0.3", - "mkdocstrings[python]>=0.20.0", - "mdx_truly_sane_lists", - "fontawesome_markdown", - "mike==1.1.2", -] [project.urls] Homepage = "https://www.anta.ninja" @@ -101,6 +88,23 @@ anta = "anta.cli:cli" include = ["anta*"] namespaces = false +################################ +# Version +################################ +[tool.bumpver] +current_version = "0.6.0" +version_pattern = "MAJOR.MINOR.PATCH" +commit_message = "bump: Version {old_version} -> {new_version}" +commit = true +# No tag +tag = false +push = false + +[tool.bumpver.file_patterns] +"pyproject.toml" = ['current_version = "{version}"', 'version = "v{version}"'] +"docs/contribution.md" = ["anta {version}"] +"docs/requirements-and-installation.md " = ["anta, version v{version}"] + ################################ # Linting ################################