Skip to content

Commit d9e92fc

Browse files
committed
Merge branch 'dev' into HEAD real 3.0.1
2 parents 2a57b76 + f396512 commit d9e92fc

File tree

3 files changed

+52
-6
lines changed

3 files changed

+52
-6
lines changed

Diff for: API_changes.rst

+8-4
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,16 @@
22
PyModbus - API changes.
33
=======================
44

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

9+
No changes.
810

911
-------------
10-
Version 3.0.1
12+
Version 3.0.0
1113
-------------
1214

13-
Currently no changes.
15+
Base
16+
17+

Diff for: CHANGELOG.rst

+42
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,45 @@
1+
version 3.0.1
2+
----------------------------------------------------------
3+
Update datastore remote to handle write requests (#1166)
4+
Allow multiple servers. (#1164)
5+
Fix typo. (#1162)
6+
Transfer parms. to connected client. (#1161)
7+
Repl enhancements 2 (#1141)
8+
Server simulator with datastore with json data. (#1157)
9+
Avoid unwanted reconnects (#1154)
10+
Do not initialize framer twice. (#1153)
11+
Allow timeout as float. (#1152)
12+
Improve Docker Support (#1145)
13+
Fix unreachable code in AsyncModbusTcpClient (#1151)
14+
Fix type hints for port and timeout (#1147)
15+
Start/stop multiple servers. (#1138)
16+
Server/asyncio.py correct logging when disconnecting the socket (#1135)
17+
Add Docker and container registry support (#1132)
18+
Removes undue reported error when forwarding (#1134)
19+
Obey timeout parameter on connection (#1131)
20+
Readme typos (#1129)
21+
Clean noqa directive. (#1125)
22+
Add isort and activate CI fail for black/isort. (#1124)
23+
Update examples. (#1117)
24+
Move logging configuration behind function call (#1120)
25+
serial2TCP forwarding example (#1116)
26+
Make serial import dynamic. (#1114)
27+
Bugfix ModbusSerialServer setup so handler is called correctly. (#1113)
28+
Clean configurations. (#1111)
29+
30+
Thanks to:
31+
32+
Alex
33+
Alexandre CUER
34+
Blaise Thompson
35+
dhoomakethu
36+
Gao Fang
37+
jan Iversen
38+
Joe Burmeister
39+
Sebastian Machuca
40+
Thijs W
41+
WouterTuinstra
42+
143
version 3.0.0
244
----------------------------------------------------------
345
* Solve multiple incomming frames. (#1107)

Diff for: README.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Supported versions
1919

2020
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).
2121

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

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

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

195195
docker pull riptideio/pymodbus
196-
196+
197197
To run this, you will need to expose ports 8080 and 5020, you can the container running:
198198

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

0 commit comments

Comments
 (0)