Merge remote-tracking branch 'upstream/dev' into dev

Author: muhlbaier

.travis.yml

@@ -10,6 +10,8 @@ matrix:
     python: "3.5"
   - os: linux
     python: "3.6"
+#  - os: linux
+#    python: "3.7"
   - os: osx
     osx_image: xcode8.3
     language: generic

CHANGELOG.rst

@@ -53,10 +53,14 @@ Version 1.5.1
 
     res = client.read_holding_registers(...)
     if not res.isError():
+
         # proceed
+ 
     else:
         # handle error or raise
 
+    """
+
 * Add examples for MEI read device information request
 
 Version 1.5.0

doc/conf.py

@@ -45,7 +45,7 @@
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = ['sphinx.ext.autodoc', 'recommonmark']
+extensions = ['sphinx.ext.autodoc', 'm2r', 'recommonmark']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -112,7 +112,8 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+# html_static_path = ['_static']
+html_static_path = []
 
 # Custom sidebar templates, must be a dictionary that maps document names
 # to template names.

doc/source/library/pymodbus.client.async.asyncio.rst

@@ -0,0 +1,8 @@
+pymodbus\.client\.asynchronous\.asyncio package
+===============================================
+
+.. automodule:: pymodbus.client.asynchronous.asyncio
+    :members:
+    :undoc-members:
+    :show-inheritance:
+