Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
janiversen committed Aug 30, 2023
2 parents d777a66 + dd7ab31 commit a8e74f8
Show file tree
Hide file tree
Showing 79 changed files with 1,809 additions and 1,162 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
integreation_test:
name: pytest - ${{ matrix.os.on }} - ${{ matrix.python.version }}
runs-on: ${{ matrix.os.on }}
timeout-minutes: 10
timeout-minutes: 20
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
run: pip install -e . -r requirements.txt

- name: pytest
run: pytest -n0 -v --full-trace --timeout=20
run: pytest -n0 -v --full-trace --timeout=1200

analyze:
name: Analyze Python
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
*.db
*.pyc
*.swp
__pycache__/
Expand Down
16 changes: 15 additions & 1 deletion API_changes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,23 @@ PyModbus - API changes.
=======================

-------------
Version 3.4.1
Version 3.5.0
-------------
- Remove handler parameter from ModbusUdpServer
- Remove loop parameter from ModbusSerialServer
- Remove handler and allow_reuse_port from repl default config
- Static classes from the :code:`constants` module are now inheriting from :code:`enum.Enum` and using `UPPER_CASE` naming scheme, this affects:
- :code:`MoreData`
- :code:`DeviceInformation`
- :code:`ModbusPlusOperation`
- :code:`Endian`
- :code:`ModbusStatus`
- Async clients now accepts `no_resend_on_retry=True`, to not resend the request when retrying.
- ModbusSerialServer now accepts request_tracer=.

-------------
Version 3.4.1
-------------
No changes.

-------------
Expand Down
136 changes: 136 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
Pymodbus v0 family
------------------

Thanks to
Albert Brandl
Galen Collins

Import to github was based on code from:
S.W.A.C. GmbH, Germany.
S.W.A.C. Bohemia s.r.o., Czech Republic.
Hynek Petrak
Galen Collins

Pymodbus v1 family
------------------

Thanks to
Antoine Pitrou
Bart de Waal
bashwork
bje-
Claudio Catterina
Chintalagiri Shashank
dhoomakethu
dragoshenron
Elvis Stansvik
Eren Inan Canpolat
Everley
Fabio Bonelli
fleimgruber
francozappa
Galen Collins
Gordon Broom
Hamilton Kibbe
Hynek Petrak
idahogray
Ingo van Lil
Jack
jbiswas
jon mills
Josh Kelley
Karl Palsson
Matheus Frata
Patrick Fuller
Perry Kundert
Philippe Gauthier
Rahul Raghunath
sanjay
schubduese42
semyont
Semyon Teplitsky
Stuart Longland
Yegor Yefremov

Pymodbus v2 family
------------------

Thanks to
alecjohanson
Alexey Andreyev
Andrea Canidio
Carlos Gomez
Cougar
Christian Sandberg
dhoomakethu
dices
Dmitri Zimine
Emil Vanherp
er888kh
Eric Duminil
Erlend Egeberg Aasland
hackerboygn
Jian-Hong Pan
Jose J Rodriguez
Justin Searle
Karl Palsson
Kim Hansen
Kristoffer Sjöberg
Kyle Altendorf
Lars Kruse
Malte Kliemann
Memet Bilgin
Michael Corcoran
Mike
sanjay
Sekenre
Siarhei Farbotka
Steffen Vogel
tcplomp
Thor Michael Støre
Tim Gates
Ville Skyttä
Wild Stray
Yegor Yefremov

Pymodbus v3 family
------------------

Thanks to
AKJ7
Alex
Alex Ruddick
Alexandre CUER
Alois Hockenschlohe
banana-sun
Blaise Thompson
cgernert
corollaries
Chris Hung
Christian Krause
dependabot[bot]
dhoomakethu
Dries
duc996
Fredo70
Gao Fang
Ghostkeeper
Hangyu Fan
Hayden Roche
Iktek
Jakob Ruhe
James Braza
jan iversen
Joe Burmeister
Kenny Johansson
Matthias Straka
Logan Gunthorpe
Pavel Kostromitinov
peufeu2
Philip Couling
Sebastian Machuca
Sefa Keleş
Thijs W
Totally a booplicate
WouterTuinstra
wriswith
Loading

0 comments on commit a8e74f8

Please sign in to comment.