Merge branch 'dev'

Author: janiversen

.github/workflows/ci.yml

@@ -103,7 +103,7 @@ jobs:
       - name: pytest
         run: |
           env
-          pytest -v --full-trace --timeout=1200
+          pytest -v --cov --full-trace --timeout=1200
 
   analyze:
     name: Analyze Python

.gitignore

@@ -17,3 +17,4 @@ build/
 /pymodbus.egg-info/
 venv
 downloaded_files/
+htmlcov/

AUTHORS.rst

@@ -13,6 +13,7 @@ Thanks to
 - AKJ7
 - Alex
 - Alex Ruddick
+- Alexander Lanin
 - Alexandre CUER
 - Alois Hockenschlohe
 - Arjan
@@ -38,9 +39,11 @@ Thanks to
 - Jakob Ruhe
 - Jakob Schlyter
 - James Braza
+- James Hilliard
 - jan iversen
 - Jerome Velociter
 - Joe Burmeister
+- julian
 - Kenny Johansson
 - Matthias Straka
 - Logan Gunthorpe
@@ -54,6 +57,7 @@ Thanks to
 - Philip Couling
 - Sebastian Machuca
 - Sefa Keleş
+- Steffen Beyer
 - Thijs W
 - Totally a booplicate
 - WouterTuinstra

CHANGELOG.rst

@@ -7,6 +7,28 @@ helps make pymodbus a better product.
 
 :ref:`Authors`: contains a complete list of volunteers have contributed to each major version.
 
+Version 3.6.4
+-------------
+* Update datastore_simulator example with client (#1967)
+* Test and correct receiving more than one packet (#1965)
+* Remove unused FifoTransactionManager. (#1966)
+* Always set exclusive serial port access. (#1964)
+* Add server/client network stub, to allow test of network packets. (#1963)
+* Combine conftest to a central file (#1962)
+* Call on_reconnect_callback. (#1959)
+* Readd ModbusBaseClient to external API.
+* Update README.rst
+* minor fix for typo and consistency (#1946)
+* More coverage. (#1947)
+* Client coverage 100%. (#1943)
+* Run coverage in CI with % check of coverage. (#1945)
+* transport 100% coverage. (#1941)
+* contrib example: TCP drainage simulator with two devices (#1936)
+* Remove "pragma no cover". (#1935)
+* transport_serial -> serialtransport. (#1933)
+* Fix behavior after Exception response (#1931)
+* Correct expected length for udp sync client. (#1930)
+
 Version 3.6.3
 -------------
 * solve Socket_framer problem with Exception response (#1925)

README.rst

@@ -11,7 +11,7 @@ PyModbus - A Python Modbus Stack
 
 Pymodbus is a full Modbus protocol implementation offering client/server with synchronous/asynchronous API a well as simulators.
 
-Current release is `3.6.3 <https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.6.3>`_.
+Current release is `3.6.4 <https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.6.4>`_.
 
 Bleeding edge (not released) is `dev <https://github.com/pymodbus-dev/pymodbus/tree/dev>`_.
 
@@ -298,7 +298,7 @@ Make a pull request::
 
 Test your changes::
 
-   cd pytest
+   cd test
    pytest
 
 

doc/source/_static/examples.tgz

@@ -168,11 +168,11 @@ Source: :github:`examples/simulator.py`
     :noindex:
 
 
-Simulator datastore example
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Source: :github:`examples/datastore_simulator.py`
+Simulator datastore (shared storage) example
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Source: :github:`examples/datastore_simulator_share.py`
 
-.. automodule:: examples.datastore_simulator
+.. automodule:: examples.datastore_simulator_share
     :undoc-members:
     :noindex:
 

doc/source/_static/examples.zip

@@ -239,7 +239,7 @@ Example "setup" configuration:
 **"co size"**, **"di size"**, **"hr size"**, **"ir size"**:
 
     Define the size of each block.
-    If using shared block the register list size will be the size of the biggest block (25 reegisters)
+    If using shared block the register list size will be the size of the biggest block (25 registers)
     If not using shared block the register list size will be the sum of the 4 block sizes (70 registers).
 
 **"shared blocks"**

doc/source/examples.rst

@@ -137,4 +137,4 @@ async def main(cmdline=None):
 
 
 if __name__ == "__main__":
-    asyncio.run(main(), debug=True)  # pragma: no cover
+    asyncio.run(main(), debug=True)