Merge branch 'dev'

Author: janiversen

CHANGELOG.rst

@@ -7,6 +7,15 @@ helps make pymodbus a better product.
 
 :ref:`Authors`: contains a complete list of volunteers have contributed to each major version.
 
+Version 3.8.3
+-------------
+* Remove deprecate from payload. (#2532)
+* Add background parameter to servers. (#2529)
+* Split async_io.py and simplify server start/stop. (#2528)
+* Update custom_msg example to include server. (#2527)
+* Move repl doc to repl repo. (#2522)
+* Add API to set max until disconnect. (#2521)
+
 Version 3.8.2
 -------------
 * Asyncio future removed from sync client. (#2514)
@@ -31,7 +40,7 @@ Version 3.8.0
 * Add trace API to server. (#2479)
 * Add trace API for client. (#2478)
 * Integrate TransactionManager in server. (#2475)
-* Rename test/sub_. (#2473)
+* Rename test/sub. (#2473)
 * Check server closes file descriptors. (#2472)
 * Update http_server.py (#2471)
 * Restrict write_registers etc to list[int]. (#2469)

MAKE_RELEASE.rst

@@ -15,8 +15,8 @@ Prepare/make release on dev.
    * Control / Update API_changes.rst
    * Update CHANGELOG.rst
       * Add commits from last release, but selectively !
-        git log --oneline v3.8.0..HEAD > commit.log
-        git log --pretty="%an" v3.8.0..HEAD | sort -uf > authors.log
+        git log --oneline v3.8.3..HEAD > commit.log
+        git log --pretty="%an" v3.8.3..HEAD | sort -uf > authors.log
         update AUTHORS.rst and CHANGELOG.rst
         cd doc; ./build_html
    * rm -rf build/* dist/*

README.rst

@@ -22,11 +22,11 @@ Our releases is defined as X.Y.Z, and we have strict rules what to release when:
 
 Upgrade examples:
 
-- 3.6.1 -> 3.6.9: just plugin the new version, no changes needed.
-- 3.6.1 -> 3.7.0: Smaller changes to the pymodbus calls might be needed
+- 3.8.1 -> 3.8.3: just plugin the new version, no changes needed.
+- 3.7.1 -> 3.8.0: Smaller changes to the pymodbus calls might be needed
 - 2.5.4 -> 3.0.0: Major changes in the application might be needed
 
-Current release is `3.8.2 <https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.8.2>`_.
+Current release is `3.8.3 <https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.8.3>`_.
 
 Bleeding edge (not released) is `dev <https://github.com/pymodbus-dev/pymodbus/tree/dev>`_.
 

doc/conf.py

@@ -21,7 +21,7 @@
     "sphinx_rtd_theme",
     "sphinx.ext.autosectionlabel"
 ]
-source_suffix = [".rst"]
+source_suffix = {'.rst': 'restructuredtext'}
 root_doc = "index"
 project = "PyModbus"
 copyright = "See license"

doc/source/_static/examples.tgz

@@ -79,11 +79,11 @@ Source: :github:`examples/client_calls.py`
     :noindex:
 
 
-Client custom message
-^^^^^^^^^^^^^^^^^^^^^
-Source: :github:`examples/client_custom_msg.py`
+Custom message
+^^^^^^^^^^^^^^
+Source: :github:`examples/custom_msg.py`
 
-.. automodule:: examples.client_custom_msg
+.. automodule:: examples.custom_msg
     :undoc-members:
     :noindex:
 

doc/source/_static/examples.zip

@@ -15,19 +15,20 @@ It is the community that decides how pymodbus evolves NOT the maintainers !
 
 The following bullet points are what the maintainers focus on:
 
-- 3.8.3 bug fix release, with:
+- 3.8.4 bug fix release, with:
     - Currently not planned
 - 3.9.0, with:
     - All of branch wait_next_api
     - ModbusControlBlock pr slave
     - New custom PDU (function codes)
+    - Simulator datastore, with simple configuration
     - Remove remote_datastore
-    - Remove BinaryPayload
 - 4.0.0, with:
+    - Remove BinaryPayload
+    - Server becomes Simulator
     - New serial forwarder
     - client async with sync/async API
     - Only one datastore, but with different API`s
-    - Simulator standard in server
     - GUI client, to analyze devices
     - GUI server, to simulate devices
 

doc/source/examples.rst

@@ -11,7 +11,7 @@
 from pymodbus.client import ModbusSerialClient
 from pymodbus.datastore import ModbusServerContext
 from pymodbus.datastore.remote import RemoteSlaveContext
-from pymodbus.server.async_io import ModbusTcpServer
+from pymodbus.server import ModbusTcpServer
 
 
 _logger = logging.getLogger(__file__)