Merge pull request #58 from HeMan/version_control

Version control
HeMan · Mar 2, 2020 · 540be80 · 540be80
2 parents 15f1ef8 + b0d9d0d
commit 540be80
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 5 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,9 +1,25 @@
 [bumpversion]
-current_version = 1.2.0
+current_version = 1.3.0
 commit = True
 tag = True
+parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)(?P<build>\d+))?
+serialize = 
+	{major}.{minor}.{patch}-{release}{build}
+	{major}.{minor}.{patch}
+
+[bumpversion:part:release]
+optional_value = prod
+first_value = dev
+values = 
+	dev
+	prod
+
+[bumpversion:part:build]
 
 [bumpversion:file:setup.py]
 
-[bumpversion:file:docs/source/conf.py]
+[bumpversion:file:VERSION]
 
+[bumpversion:file:docs/source/conf.py]
+search = version: {current_version}
+replace = {new_version}
diff --git a/VERSION b/VERSION
@@ -0,0 +1,2 @@
+
+1.3.0
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -23,7 +23,7 @@
 author = "Jimmy Hedman"
 
 # The full version, including alpha/beta/rc tags
-release = "1.2.0"
+release = "1.3.0"
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,6 +1,6 @@
 -r requirements.txt
 black
-bumpversion
+bump2version
 flake8
 flake8-black
 flask-shell-ipython

diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 
 setup(
     name="jobbergate",
-    version="1.2.0",
+    version="1.3.0",
     author="Jimmy Hedman",
     author_email="[email protected]",
     description="Questionnaire application that populates Jinja2 templates with given answers.",