Skip to content

Commit 44668d9

Browse files
authored
Merge pull request #2 from dices/Py37
Py37 changes merge
2 parents fa724ab + e40c78d commit 44668d9

File tree

73 files changed

+363
-328
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+363
-328
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ matrix:
1010
python: "3.5"
1111
- os: linux
1212
python: "3.6"
13+
- os: linux
14+
python: "3.7"
1315
- os: osx
1416
osx_image: xcode8.3
1517
language: generic

CHANGELOG.rst

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,18 @@ Version 1.5.1
3636
* Added REPR statements for all syncchronous clients
3737
* Added `isError` method to exceptions, Any response received can be tested for success before proceeding.
3838

39-
```
39+
"""
40+
4041
res = client.read_holding_registers(...)
4142
if not res.isError():
43+
4244
# proceed
45+
4346
else:
4447
# handle error or raise
45-
```
48+
49+
"""
50+
4651
* Add examples for MEI read device information request
4752

4853
Version 1.5.0

doc/conf.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
# Add any Sphinx extension module names here, as strings. They can be
4242
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
4343
# ones.
44-
extensions = ['sphinx.ext.autodoc']
44+
extensions = ['sphinx.ext.autodoc', 'm2r']
4545

4646
# Add any paths that contain templates here, relative to this directory.
4747
templates_path = ['_templates']
@@ -104,7 +104,8 @@
104104
# Add any paths that contain custom static files (such as style sheets) here,
105105
# relative to this directory. They are copied after the builtin static files,
106106
# so a file named "default.css" will overwrite the builtin "default.css".
107-
html_static_path = ['_static']
107+
# html_static_path = ['_static']
108+
html_static_path = []
108109

109110
# Custom sidebar templates, must be a dictionary that maps document names
110111
# to template names.

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

Lines changed: 0 additions & 8 deletions
This file was deleted.

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

Lines changed: 0 additions & 36 deletions
This file was deleted.

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

Lines changed: 0 additions & 55 deletions
This file was deleted.

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

Lines changed: 0 additions & 8 deletions
This file was deleted.

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

Lines changed: 0 additions & 8 deletions
This file was deleted.

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

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
pymodbus\.client\.asynchronous\.asyncio package
2+
===============================================
3+
4+
.. automodule:: pymodbus.client.asynchronous.asyncio
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:
8+

0 commit comments

Comments
 (0)