Skip to content

Commit d777a66

Browse files
committed
Merge branch 'dev'
2 parents 14d9c37 + 8aa49d5 commit d777a66

Some content is hidden

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

46 files changed

+1025
-1280
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
run: pip install -e . -r requirements.txt
9595

9696
- name: pytest
97-
run: pytest -n0 --cov=pymodbus --cov=test --cov-report=term-missing --cov-report=xml -v --full-trace --timeout=20
97+
run: pytest -n0 -v --full-trace --timeout=20
9898

9999
analyze:
100100
name: Analyze Python

.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ repos:
1212
- id: check-added-large-files
1313
# run ruff with --fix before black
1414
- repo: https://github.com/charliermarsh/ruff-pre-commit
15-
rev: 'v0.0.263'
15+
rev: 'v0.0.277'
1616
hooks:
1717
- id: ruff
1818
args: [--fix, --exit-non-zero-on-fix]

API_changes.rst

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

5+
-------------
6+
Version 3.4.1
7+
-------------
8+
9+
No changes.
10+
511
-------------
612
Version 3.4.0
713
-------------

CHANGELOG.rst

+24
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,27 @@
1+
version 3.4.1
2+
----------------------------------------------------------
3+
* Fix serial startup problems. (#1701)
4+
* pass source_address in tcp client. (#1700)
5+
* serial server use source_address[0]. (#1699)
6+
* Examples coverage nearly 100%. (#1694)
7+
* new async serial (#1681)
8+
* Docker is not supported (lack of maintainer). (#1693)
9+
* Forwarder write_coil --> write_coil. (#1691)
10+
* Change default source_address to (0.0.0.0, 502) (#1690)
11+
* Update ruff to 0.0.277 (#1689)
12+
* Fix dict comprehension (#1687)
13+
* Removed `requests` dependency from `contrib/explain.py` (#1688)
14+
* Fix broken test (#1685)
15+
* Fix readme badges (#1682)
16+
* Bump aiohttp from 3.8.3 to 3.8.5 (#1680)
17+
* pygments from 2.14.0 to 2.15.0 (#1677)
18+
19+
Thanks to:
20+
Alex
21+
James Braza
22+
jan iversen
23+
24+
125
version 3.4.0
226
----------------------------------------------------------
327
* Prepare v3.4.0.

README.rst

+2-5
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,20 @@ There are challenges small and large not only programming but also documentation
66

77
.. image:: https://github.com/pymodbus-dev/pymodbus/actions/workflows/ci.yml/badge.svg?branch=dev
88
:target: https://github.com/pymodbus-dev/pymodbus/actions/workflows/ci.yml
9-
.. image:: https://readthedocs.org/projects/pymodbus/badge/?version=latest
9+
.. image:: https://readthedocs.org/projects/pymodbus/badge/?version=latest
1010
:target: https://pymodbus.readthedocs.io/en/latest/?badge=latest
1111
:alt: Documentation Status
1212
.. image:: https://pepy.tech/badge/pymodbus
1313
:target: https://pepy.tech/project/pymodbus
1414
:alt: Downloads
15-
.. image:: https://ghcr-badge.deta.dev/pymodbus-dev/pymodbus/tags?label=Docker
16-
:target: https://github.com/pymodbus-dev/pymodbus/pkgs/container/pymodbus
17-
:alt: Docker Tags
1815

1916
------------------------------------------------------------
2017
Supported versions
2118
------------------------------------------------------------
2219

2320
Version `2.5.3 <https://github.com/pymodbus-dev/pymodbus/releases/tag/v2.5.3>`_ is the last 2.x release (python >= 2.7, no longer supported).
2421

25-
Version `3.4.0 <https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.4.0>`_ is the current release (Tested with Python >= 3.8).
22+
Version `3.4.1 <https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.4.1>`_ is the current release (Tested with Python >= 3.8).
2623

2724
.. important::
2825
All API changes after 3.0.0 are documented in `API_changes.rst <https://github.com/pymodbus-dev/pymodbus/blob/dev/API_changes.rst>`_

doc/source/examples.rst

-4
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@ Asynchronous server
5454
^^^^^^^^^^^^^^^^^^^
5555
.. literalinclude:: ../../examples/server_async.py
5656

57-
Build bcd Payload
58-
^^^^^^^^^^^^^^^^^
59-
.. literalinclude:: ../../examples/build_bcd_payload.py
60-
6157
Callback Server example
6258
^^^^^^^^^^^^^^^^^^^^^^^
6359
.. literalinclude:: ../../examples/server_callback.py

examples/build_bcd_payload.py

-222
This file was deleted.

examples/client_async.py

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python3
2-
"""Pymodbus aynchronous client example.
2+
"""Pymodbus asynchronous client example.
33
44
An example of a asynchronous client.
55
@@ -143,6 +143,11 @@ async def run_a_few_calls(client):
143143
pass
144144

145145

146+
async def main(cmdline=None):
147+
"""Combine setup and run."""
148+
testclient = setup_async_client(description="Run client.", cmdline=cmdline)
149+
await run_async_client(testclient, modbus_calls=run_a_few_calls)
150+
151+
146152
if __name__ == "__main__":
147-
testclient = setup_async_client(description="Run asynchronous client.")
148-
asyncio.run(run_async_client(testclient, modbus_calls=run_a_few_calls), debug=True)
153+
asyncio.run(main(), debug=True) # pragma: no cover

0 commit comments

Comments
 (0)