Merge branch 'dev' into HEAD

Author: janiversen

CHANGELOG.rst

@@ -1,31 +1,31 @@
-version 3.0.1
+version 3.0.2
 ----------------------------------------------------------
-Update datastore remote to handle write requests (#1166)
-Allow multiple servers. (#1164)
-Fix typo. (#1162)
-Transfer parms. to connected client. (#1161)
-Repl enhancements 2 (#1141)
-Server simulator with datastore with json data. (#1157)
-Avoid unwanted reconnects (#1154)
-Do not initialize framer twice. (#1153)
-Allow timeout as float. (#1152)
-Improve Docker Support (#1145)
-Fix unreachable code in AsyncModbusTcpClient (#1151)
-Fix type hints for port and timeout (#1147)
-Start/stop multiple servers. (#1138)
-Server/asyncio.py correct logging when disconnecting the socket (#1135)
-Add Docker and container registry support  (#1132)
-Removes undue reported error when forwarding (#1134)
-Obey timeout parameter on connection (#1131)
-Readme typos (#1129)
-Clean noqa directive. (#1125)
-Add isort and activate CI fail for black/isort. (#1124)
-Update examples. (#1117)
-Move logging configuration behind function call (#1120)
-serial2TCP forwarding example (#1116)
-Make serial import dynamic. (#1114)
-Bugfix ModbusSerialServer setup so handler is called correctly. (#1113)
-Clean configurations. (#1111)
+* Update datastore remote to handle write requests (#1166)
+* Allow multiple servers. (#1164)
+* Fix typo. (#1162)
+* Transfer parms. to connected client. (#1161)
+* Repl enhancements 2 (#1141)
+* Server simulator with datastore with json data. (#1157)
+* Avoid unwanted reconnects (#1154)
+* Do not initialize framer twice. (#1153)
+* Allow timeout as float. (#1152)
+* Improve Docker Support (#1145)
+* Fix unreachable code in AsyncModbusTcpClient (#1151)
+* Fix type hints for port and timeout (#1147)
+* Start/stop multiple servers. (#1138)
+* Server/asyncio.py correct logging when disconnecting the socket (#1135)
+* Add Docker and container registry support  (#1132)
+* Removes undue reported error when forwarding (#1134)
+* Obey timeout parameter on connection (#1131)
+* Readme typos (#1129)
+* Clean noqa directive. (#1125)
+* Add isort and activate CI fail for black/isort. (#1124)
+* Update examples. (#1117)
+* Move logging configuration behind function call (#1120)
+* serial2TCP forwarding example (#1116)
+* Make serial import dynamic. (#1114)
+* Bugfix ModbusSerialServer setup so handler is called correctly. (#1113)
+* Clean configurations. (#1111)
 
 Thanks to:
 
@@ -40,6 +40,10 @@ Thanks to:
   Thijs W
   WouterTuinstra
 
+version 3.0.1
+----------------------------------------------------------
+* Faulty release!
+
 version 3.0.0
 ----------------------------------------------------------
 * Solve multiple incomming frames. (#1107)

README.rst

@@ -19,7 +19,7 @@ Supported versions
 
 Version `2.5.3 <https://github.com/riptideio/pymodbus/releases/tag/v2.5.3>`_ is the last 2.x release (Supports python 2.7.x - 3.7).
 
-Version `3.0.1 <https://github.com/riptideio/pymodbus/releases/tag/v3.0.1>`_ is the current release (Supports Python >=3.8).
+Version `3.0.2 <https://github.com/riptideio/pymodbus/releases/tag/v3.0.2>`_ is the current release (Supports Python >=3.8).
 
 Remark: "Supports" means that we only test with those versions, lower versions (e.g. 3.7) might work depending on the functionality used.
 

pymodbus/version.py

@@ -37,7 +37,7 @@ def __str__(self):
         return f"[{self.package}, version {self.short()}]"
 
 
-version = Version("pymodbus", 3, 0, 1, "")
+version = Version("pymodbus", 3, 0, 2, "")
 version.__name__ = (  # fix epydoc error # pylint: disable=attribute-defined-outside-init
     "pymodbus"
 )