Merge pull request #279 from ess-dmsc/prepare_release_1.2.1

Prepare release 1.2.1

Author: DominicOram

docs/conf.py

@@ -23,7 +23,7 @@
 author = u'Michael Hart, Michael Wedel, Owen Arnold'
 
 version = u'1.2'
-release = u'1.2.0'
+release = u'1.2.1'
 
 language = None
 

docs/release_notes/index.rst

@@ -6,6 +6,7 @@ Here you can find release notes for all released versions of Lewis.
 .. toctree::
     :maxdepth: 1
 
+    release_1_2_1
     release_1_2_0
     release_1_1_1
     release_1_1_0

docs/release_notes/release_1_2_1.rst

@@ -0,0 +1,17 @@
+Release 1.2.1
+=============
+
+This is a minor release that fixes one bug and adds documentation.
+
+Documentation
+-------------
+
+ - Added quickstart guide.
+ 
+ - Removed references to plankton.
+ 
+
+Bug fixes
+---------
+
+ - Improved exception handling for module imports

setup.py

@@ -29,7 +29,7 @@ def readme():
 
 setup(
     name='lewis',
-    version='1.2.0',
+    version='1.2.1',
     description='LeWIS - Let\'s Write Intricate Simulators!',
     long_description=readme(),
     url='https://github.com/DMSC-Instrument-Data/lewis',

src/lewis/__init__.py

@@ -17,4 +17,4 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # *********************************************************************
 
-__version__ = '1.2.0'
+__version__ = '1.2.1'

src/lewis/devices/chopper/__init__.py

@@ -17,4 +17,4 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # *********************************************************************
 
-framework_version = '1.2.0'
+framework_version = '1.2.1'

src/lewis/devices/julabo/__init__.py

@@ -17,4 +17,4 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # *********************************************************************
 
-framework_version = '1.2.0'
+framework_version = '1.2.1'

src/lewis/devices/linkam_t95/__init__.py

@@ -17,4 +17,4 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # *********************************************************************
 
-framework_version = '1.2.0'
+framework_version = '1.2.1'

src/lewis/examples/dual_device/__init__.py

@@ -84,4 +84,4 @@ class VerySimpleStreamInterface(StreamInterface):
     out_terminator = '\r\n'
 
 
-framework_version = '1.2.0'
+framework_version = '1.2.1'

src/lewis/examples/example_motor/__init__.py

@@ -147,4 +147,4 @@ def set_target(self, new_target):
     )
 )
 
-framework_version = '1.2.0'
+framework_version = '1.2.1'