Merge branch 'dev'

Author: janiversen

.github/workflows/ci.yml

@@ -40,10 +40,10 @@ jobs:
 
     steps:
       - name: Checkout repo from github
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
 
       - name: Set up Python ${{ matrix.python }}
-        uses: actions/setup-python@v4.7.1
+        uses: actions/setup-python@v5.0.0
         with:
           python-version: ${{ matrix.python }}
 
@@ -61,7 +61,7 @@ jobs:
 
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.3.2
+        uses: actions/cache@v4.0.1
         with:
           path: ${{ env.VIRTUAL_ENV }}
           key: >-
@@ -117,15 +117,15 @@ jobs:
     runs-on: ubuntu-22.04
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4.1.1
 
-      - uses: github/codeql-action/init@v2
+      - uses: github/codeql-action/init@v3
         with:
           languages: python
 
-      - uses: github/codeql-action/autobuild@v2
+      - uses: github/codeql-action/autobuild@v3
 
-      - uses: github/codeql-action/analyze@v2
+      - uses: github/codeql-action/analyze@v3
 
   ci_complete:
     name: ci_complete

AUTHORS.rst

@@ -20,6 +20,7 @@ Thanks to
 - André Srinivasan
 - banana-sun
 - Blaise Thompson
+- CapraTheBest
 - cgernert
 - corollaries
 - Chandler Riehm
@@ -46,6 +47,7 @@ Thanks to
 - Joe Burmeister
 - Jonathan Reichelt Gjertsen
 - julian
+- Justin Standring
 - Kenny Johansson
 - Matthias Straka
 - laund

CHANGELOG.rst

@@ -7,6 +7,29 @@ helps make pymodbus a better product.
 
 :ref:`Authors`: contains a complete list of volunteers have contributed to each major version.
 
+Version 3.6.6
+-------------
+* Solve transport close() as not inherited method. (#2098)
+* enable `mypy --check-untyped-defs` (#2096)
+* Add get_expected_response_length to transaction.
+* Remove control encode in framersRemove control encode in framers. (#2095)
+* Bump codeql in CI to v3. (#2093)
+* Improve server types (#2092)
+* Remove pointless try/except (#2091)
+* Improve transport types (#2090)
+* Use explicit ValueError when called with incorrect function code (#2089)
+* update message tests (incorporate all old tests). (#2088)
+* Improve simulator type hints (#2084)
+* Cleanup dead resetFrame code (#2082)
+* integrate message.encode() into framer.buildPacket. (#2062)
+* Repair client close() (intern= is needed for ModbusProtocol). (#2080)
+* Updated Message_Parser example (#2079)
+* Fix #2069 use released repl from pypi (#2077)
+* Fix field encoding of Read File Record Response (#2075)
+* Improve simulator types (#2076)
+* Bump actions. (#2071)
+
+
 Version 3.6.5
 -------------
 * Update framers to ease message integration (only decode/encode) (#2064)

MAKE_RELEASE.rst

@@ -14,11 +14,12 @@ Prepare/make release on dev.
    * Control / Update API_changes.rst
    * Update CHANGELOG.rst
       * Add commits from last release, but selectively !
-        git log --oneline v3.6.5..HEAD > commit.log
-        git log --pretty="%an" v3.6.1..HEAD | sort -uf > authors.log
-        update AUTHORS
+        git log --oneline v3.6.6..HEAD > commit.log
+        git log --pretty="%an" v3.6.6..HEAD | sort -uf > authors.log
+        update AUTHORS.rst and CHANGELOG.rst
         cd doc; ./build_html
    * rm -rf build/* dist/*
+   * git checkout build
    * python3 -m build
    * twine check dist/*
    * Commit, push and merge.

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.5 <https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.6.5>`_.
+Current release is `3.6.6 <https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.6.6>`_.
 
 Bleeding edge (not released) is `dev <https://github.com/pymodbus-dev/pymodbus/tree/dev>`_.
 

doc/source/_static/examples.tgz

@@ -11,6 +11,7 @@
 import logging
 import textwrap
 
+from pymodbus import pymodbus_apply_logging_config
 from pymodbus.factory import ClientDecoder, ServerDecoder
 from pymodbus.transaction import (
     ModbusAsciiFramer,
@@ -80,15 +81,10 @@ def decode(self, message):
             print(f"{decoder.decoder.__class__.__name__}")
             print("-" * 80)
             try:
-                decoder.addToFrame(message)
-                if decoder.checkFrame():
-                    slave = decoder._header.get(  # pylint: disable=protected-access
-                        "uid", 0x00
-                    )
-                    decoder.advanceFrame()
-                    decoder.processIncomingPacket(message, self.report, slave)
-                else:
-                    self.check_errors(decoder, message)
+                slave = decoder._header.get(  # pylint: disable=protected-access
+                    "uid", 0x00
+                )
+                decoder.processIncomingPacket(message, self.report, slave)
             except Exception:  # pylint: disable=broad-except
                 self.check_errors(decoder, message)
 
@@ -144,6 +140,7 @@ def report(self, message):
 def parse_messages(cmdline=None):
     """Do a helper method to generate the messages to parse."""
     args = get_commandline(cmdline=cmdline)
+    pymodbus_apply_logging_config(args.log.upper())
     _logger.setLevel(args.log.upper())
     if not args.message:
         _logger.error("Missing --message.")

doc/source/_static/examples.zip

@@ -18,5 +18,5 @@
 from pymodbus.pdu import ExceptionResponse
 
 
-__version__ = "3.6.5"
+__version__ = "3.6.6"
 __version_full__ = f"[pymodbus, version {__version__}]"

examples/message_parser.py

@@ -124,7 +124,7 @@ def register(self, custom_response_class: ModbusResponse) -> None:
         """
         self.framer.decoder.register(custom_response_class)
 
-    def close(self, reconnect: bool = False) -> None:  # type: ignore[override] # pylint: disable=arguments-differ
+    def close(self, reconnect: bool = False) -> None:
         """Close connection."""
         if reconnect:
             self.connection_lost(asyncio.TimeoutError("Server not responding"))