Misc updates, bump version to 2.5.0rc1

Author: dhoomakethu

.coveragerc

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

.gitignore

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

CHANGELOG.rst

@@ -1,3 +1,19 @@
+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

@@ -45,7 +45,7 @@ ifeq ($(PYVER),3.6)
 	@pytest --cov=pymodbus/ --cov-report term-missing  test/test_server_asyncio.py test
 	@coverage report --fail-under=90 -i
 else
-	@pytest --cov=pymodbus/ --cov-report term-missing
+	@pytest --cov-config=.coveragerc --cov=pymodbus/ --cov-report term-missing --ignore test/test_server_asyncio.py test
 	@coverage report --fail-under=90 -i
 endif
 

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

pymodbus/version.py

@@ -41,7 +41,7 @@ def __str__(self):
         return '[%s, version %s]' % (self.package, self.short())
 
 
-version = Version('pymodbus', 2, 4, 0)
+version = Version('pymodbus', 2, 5, 0, "rc1")
 
 version.__name__ = 'pymodbus'  # fix epydoc error
 

setup.py

@@ -23,9 +23,15 @@
 try:
     from setup_commands import command_classes
 except ImportError:
-    command_classes={}
+    command_classes = {}
 from pymodbus import __version__, __author__, __maintainer__
+from pymodbus.utilities import IS_PYTHON3
 
+CONSOLE_SCRIPTS = [
+            'pymodbus.console=pymodbus.repl.client.main:main'
+        ]
+if IS_PYTHON3:
+    CONSOLE_SCRIPTS.append('pymodbus.server=pymodbus.repl.server.main:server')
 with open('requirements.txt') as reqs:
     install_requires = [
         line for line in reqs.read().split('\n')
@@ -89,14 +95,20 @@
         'tornado': [
             'tornado == 4.5.3'
         ],
-        'repl': [
+
+        'repl:python_version <= "2.7"': [
             'click>=7.0',
             'prompt-toolkit==2.0.4',
-            'pygments==2.2.0'
+            'pygments>=2.2.0'
+        ],
+        'repl:python_version >= "3.6"': [
+            'click>=7.0',
+            'prompt-toolkit>=3.0.8',
+            'pygments>=2.2.0'
         ]
     },
     entry_points={
-        'console_scripts': ['pymodbus.console=pymodbus.repl.main:main'],
+        'console_scripts': CONSOLE_SCRIPTS,
     },
     test_suite='nose.collector',
     cmdclass=command_classes,