Merge pull request #190 from mcvine/release-1.2.1

PR: Release 1.2.1

CMakeLists.txt

@@ -25,7 +25,7 @@
 # $ anaconda upload /home/lj7/anaconda2/conda-bld/linux-64/mcvine-1.0.1-py27_0.tar.bz2
 
 set(PROJECT_NAME "mcvine")
-set(VERSION "1.2")
+set(VERSION "1.2.1")
 set(AUTHOR "Jiao Lin")
 set(AUTHOR_EMAILE "jiao.lin@gmail.com")
 set(VENDOR "DANSE")

docs/sphinx/News.rst

@@ -7,6 +7,7 @@ News
 ----
 * **Feb 2017**:
 
+  - Release 1.2.1 (http://mcvine.github.io/1.2.1/release-notes.html) was out
   - Release 1.2 (http://mcvine.github.io/1.2/release-notes.html) was out
 
 2016

docs/sphinx/release-notes.rst

@@ -1,26 +1,23 @@
 .. _relnotes:
 
-Release Notes 1.2 - Feb 2016
-============================
+Release Notes 1.2.1 - Feb 15th 2017
+===================================
 
-In this release, we
+This release is a patch release to
+`version 1.2 <http://mcvine.github.io/1.2/release-notes.html>`_.
 
-* Made the DGS workflow tools more generic and added the HYSPEC workflow (see `example notebooks <https://github.com/mcvine/training/tree/85942f267a085c0b4456ae177c06b5e4c804a12b/HYSPEC>`_);
-* Added CLI "mcvine phonon" (see examples in `this python test case <https://github.com/mcvine/mcvine/blob/a28e6c876f52e8dcf47b9f52692159852c58138a/packages/mcvine/tests/bin/phonon/Phonon_TestCase.py>`_);
-* Made simulation applications more slurm-friendly -- MPI launcher can now be customized by env var
-    .. code-block:: shell
+In this release, we
 
-       $ export MCVINE_MPI_LAUNCHER=mpich2(mpirun)/slurm/serial
-* Added a composite shape for sample specification: SphereShell (`example xml specification <https://github.com/mcvine/mcvine/blob/f09ca1b2b2a1f8e0bde080169025f9da3b64f23d/packages/mccomponents/tests/mccomponents/sample/shape-positioning/sphere-shell/sampleassembly.xml#L9>`_);
-* fixed bugs.
+* Improved cmake rules for wrapped mcstas components
+* Fixed a bug in DGS ARCS simulation workflow
 
-Please refer to `related tickets <https://github.com/mcvine/mcvine/milestone/4?closed=1>`_
+Please refer to `related tickets <https://github.com/mcvine/mcvine/milestone/7?closed=1>`_
 for more details.
 
 
 Source code
 -----------
-can be found at `github <https://github.com/mcvine/mcvine/releases/tag/v1.2>`_
+can be found at `github <https://github.com/mcvine/mcvine/releases/tag/v1.2.1>`_
 
 
 Installation
@@ -33,4 +30,3 @@ Training materials
 ------------------
 The MCViNE training materials now hosted at
 `mcvine training github site <https://github.com/mcvine/training>`_.
-