bummp version in all files, add short changelog in docs

VAMDC · Jun 5, 2012 · 6798109 · 6798109
1 parent 07678e9
commit 6798109
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/README.Releasing b/README.Releasing
@@ -15,12 +15,11 @@ To do:
 * Edit the version number in settings_default.py
 * Check the version number in documentation, grep for uses of the old one.
 * Update tex-template for docs, both version number and date
+* Update version in doc/source/conf.py
 * merge into release branch
 * push release branch to vamdc-repo
 * make the tag
 * push the tag
-* pull and rebuild docs on http://vamdc.tmy.se/
-* update the virtual machine and upload new image
 * notify vamdc.eu/org that they should grab the tar-ball
   from the tag at GitHub and put it on the web. And to
   update their build of the docs.

diff --git a/doc/source/_templates/documentTemplate.tex b/doc/source/_templates/documentTemplate.tex
@@ -64,6 +64,7 @@
 11.12 & 25/01/2012 & T. Marquart & updates to match software release 11.12 \\ \hline 
 11.12r1 & 13/01/2012 & T. Marquart & minor updates for bugfix release \\ \hline 
 11.12r2 & 29/05/2012 & T. Marquart & updates for bugfix release \\ \hline 
+11.12r3 & 05/06/2012 & T. Marquart & minor updates for bugfix release \\ \hline 
  &  &  &  \\ \hline 
 \end{tabular}
 

diff --git a/doc/source/changes.rst b/doc/source/changes.rst
@@ -8,6 +8,14 @@ Changelog
     document before, since terms are used that are introduced later. It is meant
     for returning readers, especially the maintainers of VAMDC nodes.
 
+June 5, 2012
+---------------------
+
+**Version 11.12r3**. This is a bugfix-release over 11.12r2 with few changes.
+Among them are two bug-fixes however that make this quick release necessary.
+One was breaking XSAMS validation with molecule chemical names and another made
+the nodes reject queries from the portal.
+
 May 23, 2012
 ---------------------
 

diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -48,7 +48,7 @@
 # The short X.Y version.
 version = '11.12'
 # The full version, including alpha/beta/rc tags.
-release = '11.12r2'
+release = '11.12r3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/doc/source/intro.rst b/doc/source/intro.rst
@@ -1,5 +1,5 @@
 
-This document covers the **release 11.12r2** of the NodeSoftware.
+This document covers the **release 11.12r3** of the NodeSoftware.
 
 Links to HTML-versions:
 

diff --git a/nodes/settings_default.py b/nodes/settings_default.py
@@ -10,7 +10,7 @@
 # Software and standards version
 ###################################################
 VAMDC_STDS_VERSION = '11.12'
-NODESOFTWARE_VERSION = '11.12r2'
+NODESOFTWARE_VERSION = '11.12r3'
 
 ###################################################
 # Basic node setup