From bc2d5e561c22b52bfb6012dfb4e6cb3fa0271a41 Mon Sep 17 00:00:00 2001 From: Michael Wedel Date: Fri, 2 Jun 2017 17:23:04 +0200 Subject: [PATCH 1/2] Prepare release 1.1.1 --- docs/conf.py | 2 +- docs/release_notes/release_1_1_1.rst | 15 +++++++++++++++ lewis/__init__.py | 2 +- lewis/devices/chopper/__init__.py | 2 +- lewis/devices/julabo/__init__.py | 2 +- lewis/devices/linkam_t95/__init__.py | 2 +- lewis/examples/dual_device/__init__.py | 2 +- lewis/examples/example_motor/__init__.py | 2 +- lewis/examples/modbus_device/__init__.py | 2 +- lewis/examples/simple_device/__init__.py | 2 +- setup.py | 2 +- 11 files changed, 25 insertions(+), 10 deletions(-) create mode 100644 docs/release_notes/release_1_1_1.rst diff --git a/docs/conf.py b/docs/conf.py index 119e7905..3ff2f60d 100644 --- a/docs/conf.py +++ b/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 diff --git a/docs/release_notes/release_1_1_1.rst b/docs/release_notes/release_1_1_1.rst new file mode 100644 index 00000000..17012648 --- /dev/null +++ b/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. diff --git a/lewis/__init__.py b/lewis/__init__.py index 075da630..0b5a0581 100644 --- a/lewis/__init__.py +++ b/lewis/__init__.py @@ -17,4 +17,4 @@ # along with this program. If not, see . # ********************************************************************* -__version__ = '1.1.0' +__version__ = '1.1.1' diff --git a/lewis/devices/chopper/__init__.py b/lewis/devices/chopper/__init__.py index 0d6f48a7..50502acd 100644 --- a/lewis/devices/chopper/__init__.py +++ b/lewis/devices/chopper/__init__.py @@ -17,4 +17,4 @@ # along with this program. If not, see . # ********************************************************************* -framework_version = '1.1.0' +framework_version = '1.1.1' diff --git a/lewis/devices/julabo/__init__.py b/lewis/devices/julabo/__init__.py index 70292fe3..aac66850 100644 --- a/lewis/devices/julabo/__init__.py +++ b/lewis/devices/julabo/__init__.py @@ -17,4 +17,4 @@ # along with this program. If not, see . # ********************************************************************* -framework_version = '1.1.0' +framework_version = '1.1.1' diff --git a/lewis/devices/linkam_t95/__init__.py b/lewis/devices/linkam_t95/__init__.py index 0d6f48a7..50502acd 100644 --- a/lewis/devices/linkam_t95/__init__.py +++ b/lewis/devices/linkam_t95/__init__.py @@ -17,4 +17,4 @@ # along with this program. If not, see . # ********************************************************************* -framework_version = '1.1.0' +framework_version = '1.1.1' diff --git a/lewis/examples/dual_device/__init__.py b/lewis/examples/dual_device/__init__.py index d0ddea38..37c2039a 100644 --- a/lewis/examples/dual_device/__init__.py +++ b/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' diff --git a/lewis/examples/example_motor/__init__.py b/lewis/examples/example_motor/__init__.py index 262c5fcd..e2d3d2f5 100644 --- a/lewis/examples/example_motor/__init__.py +++ b/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' diff --git a/lewis/examples/modbus_device/__init__.py b/lewis/examples/modbus_device/__init__.py index 920d4558..1bd48699 100644 --- a/lewis/examples/modbus_device/__init__.py +++ b/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' diff --git a/lewis/examples/simple_device/__init__.py b/lewis/examples/simple_device/__init__.py index b61f3b0f..bbeb738c 100644 --- a/lewis/examples/simple_device/__init__.py +++ b/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' diff --git a/setup.py b/setup.py index 89557dd0..8cd9e64b 100644 --- a/setup.py +++ b/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', From 1e5beffde27b78ee712ce7fc932b8a5d0f685a76 Mon Sep 17 00:00:00 2001 From: Michael Wedel Date: Fri, 2 Jun 2017 17:25:47 +0200 Subject: [PATCH 2/2] Link to release notes --- docs/release_notes/index.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/release_notes/index.rst b/docs/release_notes/index.rst index eb450724..c76d806f 100644 --- a/docs/release_notes/index.rst +++ b/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