Merge branch 'v3.2.2_pick'

janiversen · janiversen · commit 844913d4ffdf · 2023-03-21T09:34:16.000+01:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,3 +1,7 @@
+version 3.2.2 (picked from dev, only bugfixes)
+----------------------------------------------------------
+* Add forgotten await
+
 version 3.2.1 (picked from dev, only bugfixes)
 ----------------------------------------------------------
 * add missing server.start(). (#1443)
diff --git a/README.rst b/README.rst
@@ -22,7 +22,7 @@ Supported versions
 
 Version `2.5.3 <https://github.com/pymodbus-dev/pymodbus/releases/tag/v2.5.3>`_ is the last 2.x release (Supports python 2.7.x - 3.7).
 
-Version `3.2.0 <https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.2.0>`_ is the current release (Supports Python >=3.8).
+Version `3.2.2 <https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.2.2>`_ is the current release (Supports Python >=3.8).
 
 .. important::
    All API changes after 3.0.0 are documented in `API_changes.rst <https://github.com/pymodbus-dev/pymodbus/blob/dev/API_changes.rst>`_
diff --git a/pymodbus/server/async_io.py b/pymodbus/server/async_io.py
@@ -1221,7 +1221,7 @@ async def StartAsyncSerialServer(  # pylint: disable=invalid-name,dangerous-defa
     server = ModbusSerialServer(
         context, kwargs.pop("framer", ModbusAsciiFramer), identity=identity, **kwargs
     )
-    server.start()
+    await server.start()
     await _serverList.run(server, custom_functions)
 
 
diff --git a/pymodbus/version.py b/pymodbus/version.py
@@ -37,4 +37,4 @@ def __str__(self) -> str:
         return f"[{self.package}, version {self.short()}]"
 
 
-version = Version("pymodbus", 3, 2, 1, "")
+version = Version("pymodbus", 3, 2, 2, "")

Original file line number	Diff line number	Diff line change
`@@ -1221,7 +1221,7 @@ async def StartAsyncSerialServer( # pylint: disable=invalid-name,dangerous-defa`
`1221`	`1221`	`server = ModbusSerialServer(`
`1222`	`1222`	`context, kwargs.pop("framer", ModbusAsciiFramer), identity=identity, **kwargs`
`1223`	`1223`	`)`
`1224`		`- server.start()`
	`1224`	`+ await server.start()`
`1225`	`1225`	`await _serverList.run(server, custom_functions)`
`1226`	`1226`
`1227`	`1227`
Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,4 @@ def __str__(self) -> str:`
`37`	`37`	`return f"[{self.package}, version {self.short()}]"`
`38`	`38`
`39`	`39`
`40`		`-version = Version("pymodbus", 3, 2, 1, "")`
	`40`	`+version = Version("pymodbus", 3, 2, 2, "")`