From 9f2e300f2bf3d495b1de39f15d43a0a1a1f21115 Mon Sep 17 00:00:00 2001
From: Nikos Skalkotos <skalkoto@grnet.gr>
Date: Tue, 13 May 2014 16:23:08 +0300
Subject: [PATCH] Bump version to 0.15rc1

Add multiple version files to automatically update the docs version too.
We need devflow 0.13rc1 or later for this to work
---
 devflow.conf          | 4 ++--
 docs/conf.py          | 7 ++++---
 docs/version.py       | 1 +
 docs/version_template | 1 +
 version               | 2 +-
 version.m4            | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 docs/version.py
 create mode 100644 docs/version_template

diff --git a/devflow.conf b/devflow.conf
index bbfdcaa..7106d92 100644
--- a/devflow.conf
+++ b/devflow.conf
@@ -1,4 +1,4 @@
 [ packages ]
   [[ devflow ]]
-    version_file = "version.m4"
-    version_template = "version_template"
+    version_file = "version.m4","docs/version.py"
+    version_template = "version_template","docs/version_template"
diff --git a/docs/conf.py b/docs/conf.py
index a5a4af2..147b3fb 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -12,7 +12,8 @@
 # serve to show the default.
 
 import sys, os
-
+sys.path.insert(0, os.path.dirname(os.path.realpath(__file__)))
+from version import __version__
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -45,9 +46,9 @@ copyright = u'2011, 2012, 2013 GRNET S.A. All rights reserved'
 # built documents.
 #
 # The short X.Y version.
-version = '0.14'
+version = __version__
 # The full version, including alpha/beta/rc tags.
-release = '0.14'
+release = __version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/version.py b/docs/version.py
new file mode 100644
index 0000000..c813577
--- /dev/null
+++ b/docs/version.py
@@ -0,0 +1 @@
+__version__ = "0.15rc1"
diff --git a/docs/version_template b/docs/version_template
new file mode 100644
index 0000000..f30be08
--- /dev/null
+++ b/docs/version_template
@@ -0,0 +1 @@
+__version__ = "%(DEVFLOW_VERSION)s"
diff --git a/version b/version
index e81d965..65b9b71 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.14next
+0.15rc1
diff --git a/version.m4 b/version.m4
index 2eda4ce..c050ee2 100644
--- a/version.m4
+++ b/version.m4
@@ -1 +1 @@
-m4_define([devflow_version], [0.14next])
+m4_define([devflow_version], [0.15rc1])
-- 
GitLab