Improving version number update

diff --git a/bin/module_version.py b/bin/module_version.py
index fc1e8ac55f9061dfc237ca4b88d1d1a8db2eb0f7..24d51d7435de194acb6e652b9e25e2260f61d1e5 100644 (file)
--- a/bin/module_version.py
+++ b/bin/module_version.py
@@ -21,5 +21,5 @@
 # Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
 
 name    = "ADAO"
-version = "V7_4_0" # Version pour catalogue, avec des "_" entre les numeros
+version = "V7_5_0" # Version pour catalogue, avec des "_" entre les numeros
 date    = ""

diff --git a/doc/en/conf.py b/doc/en/conf.py
index 4c516de678b450ed889c56f70c5c5b0cd16148d1..d7795411ad01d221648583228ff5befe91115332 100644 (file)
--- a/doc/en/conf.py
+++ b/doc/en/conf.py
@@ -67,12 +67,12 @@ copyright = u'2008-2014, Jean-Philippe ARGAUD'
 # built documents.
 #
 # The short X.Y version.
-version = '7\_main'
-version = '7.4.0'
+# version = '7\_main'
+# version = '7.4.0'
 version = '%s'%module_version.version.replace('_','\_')
 # The full version, including alpha/beta/rc tags.
-release = '7\_main'
-release = '7.4.0'
+# release = '7\_main'
+# release = '7.4.0'
 release = '%s'%module_version.version.replace('_','\_')
 
 # The language for content autogenerated by Sphinx. Refer to documentation

diff --git a/doc/fr/conf.py b/doc/fr/conf.py
index 92b58fb27e49604a8f112152f9da11e104ead81c..86c83d48c8bfc994d9a8f0bf8b50950e0b055068 100644 (file)
--- a/doc/fr/conf.py
+++ b/doc/fr/conf.py
@@ -67,12 +67,12 @@ copyright = u'2008-2014, Jean-Philippe ARGAUD'
 # built documents.
 #
 # The short X.Y version.
-version = '7\_main'
-version = '7.4.0'
+# version = '7\_main'
+# version = '7.4.0'
 version = '%s'%module_version.version.replace('_','\_')
 # The full version, including alpha/beta/rc tags.
-release = '7\_main'
-release = '7.4.0'
+# release = '7\_main'
+# release = '7.4.0'
 release = '%s'%module_version.version.replace('_','\_')
 
 # The language for content autogenerated by Sphinx. Refer to documentation