Skip to content

Commit

Permalink
Merge branch 'dev' into HEAD real 3.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
janiversen committed Nov 5, 2022
2 parents 2a57b76 + f396512 commit d9e92fc
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 6 deletions.
12 changes: 8 additions & 4 deletions API_changes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@
PyModbus - API changes.
=======================

With version 3.0.0 as base, this file will contain a list of all API changes in
each version, including new preferred ways of using the API.
-------------
Version 3.0.1
-------------

No changes.

-------------
Version 3.0.1
Version 3.0.0
-------------

Currently no changes.
Base


42 changes: 42 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,45 @@
version 3.0.1
----------------------------------------------------------
Update datastore remote to handle write requests (#1166)
Allow multiple servers. (#1164)
Fix typo. (#1162)
Transfer parms. to connected client. (#1161)
Repl enhancements 2 (#1141)
Server simulator with datastore with json data. (#1157)
Avoid unwanted reconnects (#1154)
Do not initialize framer twice. (#1153)
Allow timeout as float. (#1152)
Improve Docker Support (#1145)
Fix unreachable code in AsyncModbusTcpClient (#1151)
Fix type hints for port and timeout (#1147)
Start/stop multiple servers. (#1138)
Server/asyncio.py correct logging when disconnecting the socket (#1135)
Add Docker and container registry support (#1132)
Removes undue reported error when forwarding (#1134)
Obey timeout parameter on connection (#1131)
Readme typos (#1129)
Clean noqa directive. (#1125)
Add isort and activate CI fail for black/isort. (#1124)
Update examples. (#1117)
Move logging configuration behind function call (#1120)
serial2TCP forwarding example (#1116)
Make serial import dynamic. (#1114)
Bugfix ModbusSerialServer setup so handler is called correctly. (#1113)
Clean configurations. (#1111)

Thanks to:

Alex
Alexandre CUER
Blaise Thompson
dhoomakethu
Gao Fang
jan Iversen
Joe Burmeister
Sebastian Machuca
Thijs W
WouterTuinstra

version 3.0.0
----------------------------------------------------------
* Solve multiple incomming frames. (#1107)
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Supported versions

Version `2.5.3 <https://github.com/riptideio/pymodbus/releases/tag/v2.5.3>`_ is the last 2.x release (Supports python 2.7.x - 3.7).

Version `3.0.0 <https://github.com/riptideio/pymodbus/releases/tag/v3.0.0>`_ is the current release (Supports Python >=3.8).
Version `3.0.1 <https://github.com/riptideio/pymodbus/releases/tag/v3.0.1>`_ is the current release (Supports Python >=3.8).

Remark: "Supports" means that we only test with those versions, lower versions (e.g. 3.7) might work depending on the functionality used.

Expand Down Expand Up @@ -193,7 +193,7 @@ Or to install a specific release:
You can also use Docker to run a local image with the package installed on the image:

docker pull riptideio/pymodbus

To run this, you will need to expose ports 8080 and 5020, you can the container running:

docker run -it -p 8080:8080 -p 5020:502 riptideio/pymodbus
Expand Down

0 comments on commit d9e92fc

Please sign in to comment.