Merge pull request #247 from DMSC-Instrument-Data/release_1_1_1

Prepare release 1.1.1

docs/conf.py

@@ -27,7 +27,7 @@
 author = u'Michael Hart, Michael Wedel, Owen Arnold'
 
 version = u'1.1'
-release = u'1.1.0'
+release = u'1.1.1'
 
 language = None
 

docs/release_notes/index.rst

@@ -7,6 +7,7 @@ called "Plankton").
 .. toctree::
     :maxdepth: 1
 
+    release_1_1_1
     release_1_1_0
     release_1_0_3
     release_1_0_2

docs/release_notes/release_1_1_1.rst

@@ -0,0 +1,15 @@
+Release 1.1.1
+=============
+
+This is a pure bug fix release that removes three problems that were overlooked in the 1.1 release.
+
+Bug fixes
+---------
+
+ - Version strings in ``framework_version`` are now coerced, so that for example ``1.1`` becomes
+   ``1.1.0`` automatically.
+
+ - Lewis does no longer hang forever when starting a network service fails.
+
+ - Switching setups at runtime works again as in release 1.0.3, in 1.1. it had been disabled due
+   to an oversight.

lewis/__init__.py

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

lewis/devices/chopper/__init__.py

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

lewis/devices/julabo/__init__.py

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

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.1.0'
+framework_version = '1.1.1'

lewis/examples/dual_device/__init__.py

@@ -75,4 +75,4 @@ class VerySimpleStreamInterface(StreamInterface):
     out_terminator = '\r\n'
 
 
-framework_version = '1.1.0'
+framework_version = '1.1.1'

lewis/examples/example_motor/__init__.py

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

lewis/examples/modbus_device/__init__.py

@@ -42,4 +42,4 @@ class ExampleModbusInterface(ModbusInterface):
     hr = ir
 
 
-framework_version = '1.1.0'
+framework_version = '1.1.1'

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.1.0'
+framework_version = '1.1.1'

setup.py

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