Merge branch 'dev' into test_macos

Author: altendky

.coveragerc

@@ -2,4 +2,5 @@
 omit =
     pymodbus/repl/*
     pymodbus/internal/*
-    pymodbus/server/asyncio.py
+    pymodbus/server/asyncio.py
+    pymodbus/server/reactive/*

.github/workflows/ci.yml

@@ -165,7 +165,7 @@ jobs:
           pip install --upgrade tox
       - uses: twisted/[email protected]
       - name: Test
-        continue-on-error: ${{ matrix.task.continue_on_error }}
+        continue-on-error: ${{ matrix.task.continue_on_error == true }}
         run: |
           tox -vv -e ${{ matrix.task.tox }}
   coverage:
@@ -211,6 +211,7 @@ 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
@@ -219,7 +220,7 @@ jobs:
           name: coverage
           path: coverage_reports
       - name: Test
-        continue-on-error: ${{ matrix.task.continue_on_error }}
+        continue-on-error: ${{ matrix.task.continue_on_error == true }}
         run: |
           tox -vv -e ${{ matrix.task.tox }}
   all:

.gitignore

@@ -37,3 +37,5 @@ test/__pycache__/
 /doc/_build/
 .pytest_cache/
 **/.pymodhis
+/build/
+/dist/

CHANGELOG.rst

@@ -1,3 +1,46 @@
+version 2.5.0
+----------------------------------------------------------
+* Support response types `stray` and `empty` in repl server.
+* Minor updates in asyncio server.
+* Update reactive server to send stray response of given length.
+* Transaction manager updates on retries for empty and invalid packets.
+* Test fixes for asyncio client and transaction manager.
+* Fix sync client and processing of incomplete frames with rtu framers
+* Support synchronous diagnostic client (TCP)
+* Server updates (REPL and async)
+* Handle Memory leak in sync servers due to socketserver memory leak
+
+version 2.5.0rc3
+----------------------------------------------------------
+* Minor fix in documentations
+* Travis fix for Mac OSX
+* Disable unnecessary deprecation warning while using async clients.
+* Use Github actions for builds in favor of travis.
+
+
+version 2.5.0rc2
+----------------------------------------------------------
+* Documentation updates
+* Disable `strict` mode by default.
+* Fix `ReportSlaveIdRequest` request
+* Sparse datablock initialization updates.
+
+version 2.5.0rc1
+----------------------------------------------------------
+* Support REPL for modbus server (only python3 and asyncio)
+* Fix REPL client for write requests
+* Fix examples
+  * Asyncio server
+  * Asynchronous server (with custom datablock)
+  * Fix version info for servers
+* Fix and enhancements to Tornado clients (seril and tcp)
+* Fix and enhancements to Asyncio client and server
+* Update Install instructions
+* Synchronous client retry on empty and error enhancments
+* Add new modbus state `RETRYING`
+* Support runtime response manipulations for Servers
+* Bug fixes with logging module in servers
+* Asyncio modbus serial server support
 
 Version 2.4.0
 ----------------------------------------------------------

Makefile

@@ -42,11 +42,20 @@ check: install
 test: install
 	@pip install --upgrade --quiet --requirement=requirements-tests.txt
 ifeq ($(PYVER),3.6)
+	$(info Running tests on $(PYVER))
+	@pip install --upgrade pip --quiet
 	@pytest --cov=pymodbus/ --cov-report term-missing  test/test_server_asyncio.py test
+	@coverage report --fail-under=85 -i
+else ifeq ($(PYVER),2.7)
+	$(info Running tests on $(PYVER))
+	@pip install pip==20.3.4 --quiet
+	@pytest --cov-config=.coveragerc --cov=pymodbus/ --cov-report term-missing --ignore test/test_server_asyncio.py --ignore test/test_client_async_asyncio.py test
 	@coverage report --fail-under=90 -i
 else
-	@pytest --cov=pymodbus/ --cov-report term-missing
-	@coverage report --fail-under=90 -i
+	$(info Running tests on $(PYVER))
+	@pip install --upgrade pip --quiet
+	@pytest --cov=pymodbus/ --cov-report term-missing  test
+	@coverage report --fail-under=85 -i
 endif
 
 tox: install

README.rst

@@ -7,7 +7,7 @@ PyModbus - A Python Modbus Stack
 .. image:: https://badges.gitter.im/Join%20Chat.svg
    :target: https://gitter.im/pymodbus_dev/Lobby 
 .. image:: https://readthedocs.org/projects/pymodbus/badge/?version=latest
-   :target: http://pymodbus.readthedocs.io/en/async/?badge=latest 
+   :target: http://pymodbus.readthedocs.io/en/latest/?badge=latest
    :alt: Documentation Status
 .. image:: http://pepy.tech/badge/pymodbus
    :target: http://pepy.tech/project/pymodbus 

doc/INSTALL

@@ -1,8 +1,8 @@
 Requirements
 -------------
 
-* Python 2.3 or later.
-* Python Twisted
+* Python 2.7 or later.
+* Python Twisted, Tornado or asyncio (For async client and server)
 * Pyserial
 
 On Windows pywin32 is recommended (this is built in to ActivePython,
@@ -35,7 +35,7 @@ much easier to run with the nose package.  With that installed, you can
 use either of the following::
 
     python setup.py test
-    nosetests
+    pytest
 
 
 Building Documentation

doc/source/library/REPL.md

@@ -200,7 +200,7 @@ result.raw                                   Return raw result dict.
 
 ```
 
-Every command has auto suggetion on the arguments supported , supply arg and value are to be supplied in `arg=val` format.
+Every command has auto suggestion on the arguments supported, arg and value are to be supplied in `arg=val` format.
 ```
 
 > client.read_holding_registers count=4 address=9 unit=1

examples/common/README.rst

@@ -92,11 +92,13 @@ the tools/nullmodem/linux directory::
 
     sudo ./run
 
+The third method is Generic Unix method below.
+
 ------------------------------------------------------------
 Windows
 ------------------------------------------------------------
 
-For Windows, simply use the com2com application that is in
+For Windows, simply use the com0com application that is in
 the directory tools/nullmodem/windows. Instructions are
 included in the Readme.txt.
 

examples/common/asynchronous_server.py

@@ -9,7 +9,8 @@
 """
 # --------------------------------------------------------------------------- # 
 # import the various server implementations
-# --------------------------------------------------------------------------- # 
+# --------------------------------------------------------------------------- #
+from pymodbus.version import version
 from pymodbus.server.asynchronous import StartTcpServer
 from pymodbus.server.asynchronous import StartUdpServer
 from pymodbus.server.asynchronous import StartSerialServer
@@ -105,10 +106,10 @@ def run_async_server():
     identity = ModbusDeviceIdentification()
     identity.VendorName = 'Pymodbus'
     identity.ProductCode = 'PM'
-    identity.VendorUrl = 'http://github.com/bashwork/pymodbus/'
+    identity.VendorUrl = 'http://github.com/riptideio/pymodbus/'
     identity.ProductName = 'Pymodbus Server'
     identity.ModelName = 'Pymodbus Server'
-    identity.MajorMinorRevision = '2.3.0'
+    identity.MajorMinorRevision = version.short()
 
     # ----------------------------------------------------------------------- # 
     # run the server you want