update bumpversion config

unicef · Feb 1, 2019 · 099d2d1 · 099d2d1
1 parent c28a3c4
commit 099d2d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -3,7 +3,7 @@ current_version = 1.15
 commit = True
 tag = False
 allow_dirty = True
-parse = (?P<major>\d+)\.(?P<minor>\d+)((?P<release>[a-z]+)(?P<num>\d+))?
+parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<release>[a-z]+)
 serialize = 
 	{major}.{minor}{release}{num}
 	{major}.{minor}
@@ -22,7 +22,7 @@ serialize =
 
 [bumpversion:file:docker/Makefile]
 serialize = 
-	{major}.{minor}{release}{num}
+	{major}.{minor}{release}
 
 [bumpversion:file:src/etools_datamart/__init__.py]
 serialize = 

diff --git a/docker/Makefile b/docker/Makefile
@@ -4,7 +4,7 @@ DATABASE_URL_ETOOLS?=
 DEVELOP?=0
 DOCKER_PASS?=
 DOCKER_USER?=
-TARGET?=1.15a0
+TARGET?=1.15
 # below vars are used internally
 BUILD_OPTIONS?=--squash
 CMD?=datamart