Merge branch 'dev' to define 3.0.0dev5.

Author: janiversen

.coveragerc

@@ -1,6 +1,8 @@
 [run]
+include =
+    pymodbus/
+    test/
 omit =
-    pymodbus/repl/*
-    pymodbus/internal/*
-    pymodbus/server/asyncio.py
-    pymodbus/server/reactive/*
+    test/TO_DO_REWRITE
+    examples/common/tornado_twister
+    examples/contrib/tornado_twister

.github/ISSUE_TEMPLATE.md

@@ -4,6 +4,7 @@ support questions.
 
 Before opening a new issue, make sure you do the following:
     * check that your issue isn't already filed: https://github.com/riptideio/pymodbus/issues
+    * check the discussions forum https://github.com/riptideio/pymodbus/discussions
     * prepare a short, runnable example that reproduce the issue with the latest development version of Pymodbus
 -->
 

.github/pythonpackage.yml

@@ -15,12 +15,12 @@ jobs:
         python-version: '3.x'
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
+        python3 -m pip install --upgrade pip
         pip install setuptools wheel twine
     - name: Build and publish
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
         TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
       run: |
-        python setup.py sdist bdist_wheel
+        python3 setup.py sdist bdist_wheel
         twine upload dist/*

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ name: CI
 on:
   push:
     branches:
-      - dev
+      - dev*
       - master
     tags:
       - v*
@@ -20,8 +20,9 @@ jobs:
     name: ${{ matrix.task.name }} - ${{ matrix.os.name }} ${{ matrix.python.name }} ${{ matrix.arch.name }}
     runs-on: ${{ matrix.os.runs-on }}
     container: ${{ matrix.os.container[matrix.python.docker] }}
-    # present runtime seems to be about 1 minute 30 seconds
-    timeout-minutes: 10
+    # present runtime seems to be about 2-4 minutes
+    # with pypy being the exception (7 minutes)
+    timeout-minutes: 15
     strategy:
       fail-fast: false
       matrix:
@@ -34,12 +35,9 @@ jobs:
             runs-on: ubuntu-latest
             matrix: linux
             container:
-              2.7: docker://python:2.7-buster
-              3.6: docker://python:3.6-buster
-              3.7: docker://python:3.7-buster
               3.8: docker://python:3.8-buster
               3.9: docker://python:3.9-buster
-              pypy2: docker://pypy:2-jessie
+              3.10: docker://python:3.10-buster
               pypy3: docker://pypy:3-stretch
           - name: macOS
             runs-on: macos-latest
@@ -51,31 +49,6 @@ jobs:
               x86: win32
               x64: win64
         python:
-          - name: CPython 2.7
-            tox: py27
-            action: 2.7
-            docker: 2.7
-            matrix: 2.7
-            implementation: cpython
-          - name: PyPy 2.7
-            tox: pypy27
-            action: pypy-2.7
-            docker: pypy2.7
-            matrix: 2.7
-            implementation: pypy
-            openssl_msvc_version: 2019
-          - name: CPython 3.6
-            tox: py36
-            action: 3.6
-            docker: 3.6
-            matrix: 3.6
-            implementation: cpython
-          - name: CPython 3.7
-            tox: py37
-            action: 3.7
-            docker: 3.7
-            matrix: 3.7
-            implementation: cpython
           - name: CPython 3.8
             tox: py38
             action: 3.8
@@ -88,18 +61,17 @@ jobs:
             docker: 3.9
             matrix: 3.9
             implementation: cpython
-          - name: PyPy 3.6
-            tox: pypy36
-            action: pypy-3.6
-            docker: pypy3.6
-            matrix: 3.6
-            implementation: pypy
-            openssl_msvc_version: 2019
-          - name: PyPy 3.7
-            tox: pypy37
-            action: pypy-3.7
-            docker: pypy3.7
-            matrix: 3.7
+          - name: 'CPython 3.10'
+            tox: 'py310'
+            action: '3.10'
+            docker: '3.10'
+            matrix: '3.10'
+            implementation: cpython
+          - name: PyPy 3.8
+            tox: pypy38
+            action: pypy-3.8
+            docker: pypy3.8
+            matrix: 3.8
             implementation: pypy
             openssl_msvc_version: 2019
         arch:
@@ -124,6 +96,11 @@ jobs:
               implementation: pypy
             arch:
               matrix: x64
+          - os:
+              matrix: windows
+            python:
+              implementation: pypy
+              matrix: 3.8
     env:
       # Should match name above
       JOB_NAME: ${{ matrix.task.name }} - ${{ matrix.os.name }} ${{ matrix.python.name }} ${{ matrix.arch.name }}
@@ -147,7 +124,6 @@ jobs:
         run: |
           pip install --upgrade pip setuptools wheel
           pip install --upgrade tox
-      - uses: twisted/[email protected]
       - name: Add PyPy Externals
         if: ${{ matrix.os.matrix == 'windows' && matrix.python.implementation == 'pypy'}}
         env:
@@ -202,11 +178,24 @@ jobs:
       fail-fast: false
       matrix:
         task:
+          - name: pylint
+            tox: pylint
+            # continue_on_error: true
+          - name: codespell
+            tox: codespell
+            # continue_on_error: true
+          - name: bandit
+            tox: bandit
+            # continue_on_error: true
           - name: flake8
             tox: flake8
-            continue_on_error: true
+            # continue_on_error: true
+          - name: black
+            tox: black
+            # continue_on_error: true
           - name: Docs
             tox: docs
+            # continue_on_error: true
         os:
           - name: Linux
             runs-on: ubuntu-latest
@@ -234,7 +223,6 @@ jobs:
         run: |
           pip install --upgrade pip setuptools wheel
           pip install --upgrade tox
-      - uses: twisted/[email protected]
       - name: Test
         continue-on-error: ${{ matrix.task.continue_on_error == true }}
         run: |
@@ -281,8 +269,6 @@ jobs:
         run: |
           pip install --upgrade pip setuptools wheel
           pip install --upgrade tox
-          pip install --upgrade six
-      - uses: twisted/[email protected]
       - name: Download Coverage
         if: matrix.task.download_coverage
         uses: actions/download-artifact@v2

.gitignore

@@ -2,6 +2,7 @@
 *.swp
 build/
 dist/
+venv/
 pymodbus.egg-info/
 .coverage
 .vscode
@@ -39,3 +40,5 @@ test/__pycache__/
 **/.pymodhis
 /build/
 /dist/
+**/.DS_Store
+/venv

.isort.cfg

@@ -0,0 +1,21 @@
+# Configuration settings for isort.
+[settings]
+py_version=38
+profile=black
+line_length = 80
+lines_after_imports = 2
+known_local_folder =
+    common
+    contrib
+sections =
+    FUTURE
+    STDLIB
+    THIRDPARTY
+    FIRSTPARTY
+    LOCALFOLDER
+include_trailing_comma = true
+use_parentheses = true
+combine_as_imports = true
+force_sort_within_sections = true
+forced_separate = doc,examples,pymodbus,test
+known_first_party = doc,examples,pymodbus,test

.readthedocs.yml

@@ -2,10 +2,8 @@
 formats:
     - epub
     - pdf
-requirements_file: requirements-docs.txt
+requirements_file: requirements.txt
 python:
     extra_requirements:
-        - twisted
-        - tornado
         - documents
-    version: 3.5
+    version: 3.8

CHANGELOG.rst

@@ -1,3 +1,38 @@
+version 3.0.0dev4
+----------------------------------------------------------
+* Documentation updates
+* PEP8 compatibale code
+* More tooling and CI updates
+
+version 3.0.0dev3
+----------------------------------------------------------
+* Remove python2 compatibility code (#564)
+* Remove Python2 checks and Python2 code snippets
+* Misc co-routines related fixes
+* Fix CI for python3 and remove PyPI from CI
+
+
+version 3.0.0dev2
+----------------------------------------------------------
+* Fix mask_write_register call. (#685)
+* Add support for byte strings in the device information fields (#693)
+* Catch socket going away. (#722)
+* Misc typo errors (#718)
+
+version 3.0.0dev1
+----------------------------------------------------------
+* Support python3.10
+* Implement asyncio ModbusSerialServer
+* ModbusTLS updates (tls handshake, default framer)
+* Support broadcast messages with asyncio client
+* Fix for lazy loading serial module with asyncio clients.
+* Updated examples and tests
+
+version 3.0.0dev0
+----------------------------------------------------------
+* Support python3.7 and above
+* Support creating asyncio clients from with in coroutines.
+
 version 2.5.3
 ----------------------------------------------------------
 * Fix retries on tcp client failing randomly.
@@ -95,7 +130,7 @@ Version 2.3.0rc1
 
 Version 2.2.0
 -----------------------------------------------------------
-**NOTE: Supports python 3.7, async client is now moved to pymodbus/client/asychronous**
+**NOTE: Supports python 3.7, async client is now moved to pymodbus/client/asynchronous**
 
 
 .. code-block:: python
@@ -225,7 +260,7 @@ Version 1.4.0
 * Support Database slave contexts (SqlStore and RedisStore)
 * Custom handlers could be passed to Modbus TCP servers
 * Asynchronous Server could now be stopped when running on a seperate thread (StopServer)
-* Signal handlers on Asyncronous servers are now handled based on current thread
+* Signal handlers on Asynchronous servers are now handled based on current thread
 * Registers in Database datastore could now be read from remote clients
 * Fix examples in contrib (message_parser.py/message_generator.py/remote_server_context)
 * Add new example for SqlStore and RedisStore (db store slave context)
@@ -240,7 +275,7 @@ Version 1.3.2
 * Fix issue with server and client where in the frame buffer had values from previous unsuccesful transaction
 * Fix response length calculation for ModbusASCII protocol
 * Fix response length calculation ReportSlaveIdResponse, DiagnosticStatusResponse
-* Fix never ending transaction case when response is recieved without header and CRC
+* Fix never ending transaction case when response is received without header and CRC
 * Fix tests
 
 Version 1.3.1