update makefile

Author: R-Palazzo

Makefile

@@ -167,34 +167,34 @@ publish: dist publish-confirm ## package and upload a release
 bumpversion-release: ## Merge main to stable and bumpversion release
 	git checkout stable || git checkout -b stable
 	git merge --no-ff main -m"make release-tag: Merge branch 'main' into stable"
-	bumpversion release
+	bump-my-version bump release
 	git push --tags origin stable
 
 .PHONY: bumpversion-release-test
 bumpversion-release-test: ## Merge main to stable and bumpversion release
 	git checkout stable || git checkout -b stable
 	git merge --no-ff main -m"make release-tag: Merge branch 'main' into stable"
-	bumpversion release --no-tag
+	bump-my-version bump release --no-tag
 	@echo git push --tags origin stable
 
 .PHONY: bumpversion-patch
 bumpversion-patch: ## Merge stable to main and bumpversion patch
 	git checkout main
 	git merge stable
-	bumpversion --no-tag patch
+	bump-my-version bump patch --no-tag
 	git push
 
 .PHONY: bumpversion-candidate
 bumpversion-candidate: ## Bump the version to the next candidate
-	bumpversion candidate --no-tag
+	bump-my-version bump candidate --no-tag
 
 .PHONY: bumpversion-minor
 bumpversion-minor: ## Bump the version the next minor skipping the release
-	bumpversion --no-tag minor
+	bump-my-version bump minor --no-tag
 
 .PHONY: bumpversion-major
 bumpversion-major: ## Bump the version the next major skipping the release
-	bumpversion --no-tag major
+	bump-my-version bump major --no-tag
 
 .PHONY: bumpversion-revert
 bumpversion-revert: ## Undo a previous bumpversion-release

deepecho/version/__init__.py

@@ -52,7 +52,7 @@ dev = [
 
     # general
     'setuptools<49.2',
-    'bumpversion>=0.5.3,<0.6',
+    'bump-my-version>=0.18.3,<1',
     'pip>=9.0.1',
     'watchdog>=0.8.3,<0.11',
 
@@ -122,7 +122,7 @@ namespaces = false
 ]
 
 [tool.setuptools.dynamic]
-version = {attr = 'deepecho.version.__version__'}
+version = {attr = 'deepecho.__version__'}
 
 [tool.isort]
 include_trailing_comment = true
@@ -135,6 +135,37 @@ use_parentheses = true
 [tool.pytest.ini_options]
 collect_ignore = ['pyproject.toml']
 
+[tool.bumpversion]
+current_version = '0.5.1'
+parse = '(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)'
+serialize = [
+    '{major}.{minor}.{patch}-{release}{candidate}',
+    '{major}.{minor}.{patch}'
+]
+search = '{current_version}'
+replace = '{new_version}'
+regex = false
+ignore_missing_version = false
+tag = true
+sign_tags = false
+tag_name = 'v{new_version}'
+tag_message = 'Bump version: {current_version} → {new_version}'
+allow_dirty = false
+commit = true
+message = 'Bump version: {current_version} → {new_version}'
+commit_args = ''
+
+[tool.bumpversion.parts.release]
+values = [
+    'dev',
+    'release'
+]
+optional_value = 'release'
+
+[tool.bumpversion.files]
+pyproject.toml = {search = 'current_version="{current_version}"', replace = 'current_version="{new_version}"'}
+"deepecho/__init__.py" = {search = '__version__ = "{current_version}"', replace = '__version__ = "{new_version}"'}
+
 [build-system]
 requires = ['setuptools', 'wheel']
 build-backend = 'setuptools.build_meta'