Merge pull request #246 from riptideio/async

Redesign Async client implementation with support to tornado and asyncio

Author: dhoomakethu

.coveragerc

@@ -22,6 +22,11 @@ pymodbus/server/__pycache__/
 test/__pycache__/
 **/pymodbus.db
 /.eggs/
+/test/bin/
+/test/include/
+/test/lib/
+/test/pip-selfcheck.json
+/test/.Python
 /.cache/
 /doc/sphinx/doctrees/
 /doc_new/

.gitignore

@@ -7,3 +7,4 @@ python:
     extra_requirements:
         - twisted
         - documents
+    version: 3.5

.readthedocs.yml

@@ -11,13 +11,15 @@ matrix:
   - os: linux
     python: "3.6"
   - os: osx
+    osx_image: xcode8.3
     language: generic
 before_install:
   - if [ $TRAVIS_OS_NAME = osx ]; then brew update; fi
   - if [ $TRAVIS_OS_NAME = osx ]; then brew install openssl; fi
 
 install:
 #  - scripts/travis.sh pip install pip-accel
+  - scripts/travis.sh pip install -U setuptools
   - scripts/travis.sh pip install coveralls
   - scripts/travis.sh pip install --requirement=requirements-checks.txt
   - scripts/travis.sh pip install --requirement=requirements-tests.txt

.travis.yml

@@ -1,3 +1,9 @@
+Version 2.0.0rc1
+-----------------------------------------------------------
+**Note This is a Major release and might affect your existing Async client implementation. Refer examples on how to use the latest async clients.**
+
+* Async client implementation based on Tornado, Twisted and asyncio
+
 Version 1.5.1
 ------------------------------------------------------------
 * Fix device information selectors
@@ -36,6 +42,7 @@ Version 1.5.0
 * Modbus read retries works only when empty/no message is received
 * Change test runner from nosetest to pytest
 * Fix Misc examples
+>>>>>>> master
 
 Version 1.4.0
 ------------------------------------------------------------

CHANGELOG.rst

@@ -0,0 +1,3 @@
+include requirements.txt
+include README.rst
+include CHANGELOG.rst

MANIFEST.in

@@ -39,7 +39,7 @@ check: install
 
 test: install
 	@pip install --quiet --requirement=requirements-tests.txt
-	@py.test
+	@py.test --cov=pymodbus/ --cov-report term-missing
 	@coverage report --fail-under=90
 
 tox: install

Makefile

@@ -4,10 +4,13 @@
 .. image:: https://badges.gitter.im/Join%20Chat.svg
    :target: https://gitter.im/pymodbus_dev/Lobby
 
-.. image:: https://readthedocs.org/projects/pymodbus-n/badge/?version=latest
-   :target: http://pymodbus-n.readthedocs.io/en/latest/?badge=latest
+.. image:: https://readthedocs.org/projects/pymodbus/badge/?version=latest
+   :target: http://pymodbus.readthedocs.io/en/async/?badge=latest
    :alt: Documentation Status
 
+.. important::
+   **Note This is a Major release and might affect your existing Async client implementation. Refer examples on how to use the latest async clients.**
+
 ============================================================
 Summary
 ============================================================

README.rst

@@ -1,4 +1,4 @@
 ==================================================
-Asynchronous Client Example
+Async Asyncio Client Example
 ==================================================
-.. literalinclude:: ../../../examples/common/asynchronous_client.py
+.. literalinclude:: ../../../examples/common/async_asyncio_client.py

doc/source/example/asynchronous_client.rst renamed to doc/source/example/async_asyncio_client.rst

@@ -0,0 +1,4 @@
+==================================================
+Async Asyncio Serial Client Example
+==================================================
+.. literalinclude:: ../../../examples/common/async_asyncio_serial_client.py