diff --git a/docs/conf.py b/docs/conf.py index 56b95a90..364571fe 100644 --- a/docs/conf.py +++ b/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 diff --git a/docs/release_notes/index.rst b/docs/release_notes/index.rst index 258d9f6a..81dcc4f9 100644 --- a/docs/release_notes/index.rst +++ b/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 diff --git a/docs/release_notes/release_1_2_1.rst b/docs/release_notes/release_1_2_1.rst new file mode 100644 index 00000000..f8d93da3 --- /dev/null +++ b/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 diff --git a/setup.py b/setup.py index 4796b8c7..b7cc8cf9 100644 --- a/setup.py +++ b/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', diff --git a/src/lewis/__init__.py b/src/lewis/__init__.py index d2a258bb..606df658 100644 --- a/src/lewis/__init__.py +++ b/src/lewis/__init__.py @@ -17,4 +17,4 @@ # along with this program. If not, see . # ********************************************************************* -__version__ = '1.2.0' +__version__ = '1.2.1' diff --git a/src/lewis/devices/chopper/__init__.py b/src/lewis/devices/chopper/__init__.py index 9c0168c7..11633d9f 100644 --- a/src/lewis/devices/chopper/__init__.py +++ b/src/lewis/devices/chopper/__init__.py @@ -17,4 +17,4 @@ # along with this program. If not, see . # ********************************************************************* -framework_version = '1.2.0' +framework_version = '1.2.1' diff --git a/src/lewis/devices/julabo/__init__.py b/src/lewis/devices/julabo/__init__.py index 9c0168c7..11633d9f 100644 --- a/src/lewis/devices/julabo/__init__.py +++ b/src/lewis/devices/julabo/__init__.py @@ -17,4 +17,4 @@ # along with this program. If not, see . # ********************************************************************* -framework_version = '1.2.0' +framework_version = '1.2.1' diff --git a/src/lewis/devices/linkam_t95/__init__.py b/src/lewis/devices/linkam_t95/__init__.py index 9c0168c7..11633d9f 100644 --- a/src/lewis/devices/linkam_t95/__init__.py +++ b/src/lewis/devices/linkam_t95/__init__.py @@ -17,4 +17,4 @@ # along with this program. If not, see . # ********************************************************************* -framework_version = '1.2.0' +framework_version = '1.2.1' diff --git a/src/lewis/examples/dual_device/__init__.py b/src/lewis/examples/dual_device/__init__.py index ba76efe6..81d2441e 100644 --- a/src/lewis/examples/dual_device/__init__.py +++ b/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' diff --git a/src/lewis/examples/example_motor/__init__.py b/src/lewis/examples/example_motor/__init__.py index 0fb020f1..ef36581e 100644 --- a/src/lewis/examples/example_motor/__init__.py +++ b/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' diff --git a/src/lewis/examples/modbus_device/__init__.py b/src/lewis/examples/modbus_device/__init__.py index e8a402e6..42753a5e 100644 --- a/src/lewis/examples/modbus_device/__init__.py +++ b/src/lewis/examples/modbus_device/__init__.py @@ -42,4 +42,4 @@ class ExampleModbusInterface(ModbusInterface): hr = ir -framework_version = '1.2.0' +framework_version = '1.2.1' diff --git a/src/lewis/examples/simple_device/__init__.py b/src/lewis/examples/simple_device/__init__.py index 16ef60a2..6e1b90f0 100644 --- a/src/lewis/examples/simple_device/__init__.py +++ b/src/lewis/examples/simple_device/__init__.py @@ -69,4 +69,4 @@ def handle_error(self, request, error): return 'An error occurred: ' + repr(error) -framework_version = '1.2.0' +framework_version = '1.2.1'