From 2fe9be0024196d21ab219c5c5ba6c62d5cfe8c8a Mon Sep 17 00:00:00 2001
From: Thomas Druez <tdruez@nexb.com>
Date: Wed, 7 Apr 2021 10:42:11 +0200
Subject: [PATCH] Replace bump2version with bumpver following the switch to
 CalVer #119

Signed-off-by: Thomas Druez <tdruez@nexb.com>
---
 .bumpversion.cfg         |  5 -----
 Makefile                 |  4 ++--
 etc/requirements/dev.txt |  2 +-
 setup.cfg                | 10 ++++++++++
 4 files changed, 13 insertions(+), 8 deletions(-)
 delete mode 100644 .bumpversion.cfg

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
deleted file mode 100644
index aded62e5c..000000000
--- a/.bumpversion.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-[bumpversion]
-current_version = 1.1.0
-files = setup.py scancodeio/__init__.py docs/offline-installation.rst
-commit = False
-tag = False
diff --git a/Makefile b/Makefile
index b7a4807f6..bb84ff4e1 100644
--- a/Makefile
+++ b/Makefile
@@ -124,8 +124,8 @@ package: conf
 	bin/python setup.py sdist
 
 bump:
-	@echo "-> Bump the version to next patch number: 'major.minor.patch'"
-	bin/bumpversion patch --allow-dirty
+	@echo "-> Bump the version"
+	bin/bumpver update --no-fetch
 
 docs:
 	rm -rf docs/_build/
diff --git a/etc/requirements/dev.txt b/etc/requirements/dev.txt
index eff513a86..69da8ad45 100644
--- a/etc/requirements/dev.txt
+++ b/etc/requirements/dev.txt
@@ -10,4 +10,4 @@ Sphinx==3.5.3
 sphinx_rtd_theme==0.5.2
 
 # Release
-bump2version==1.0.1
+bumpver==2021.1112
diff --git a/setup.cfg b/setup.cfg
index 30c519ab0..238927f34 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -9,3 +9,13 @@ line_length = 88
 known_django = django
 sections = FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
 skip = lib,migrations,bin,settings,data,Script,Lib,lib64,local,var,tmp,thirdparty
+
+[bumpver]
+current_version = "21.4.5"
+version_pattern = "YY.MM.DD"
+
+[bumpver:file_patterns]
+setup.cfg = current_version = "{version}"
+setup.py = {version}
+scancodeio/__init__.py = {version}
+docs/offline-installation.rst = {version}