Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 799e8df

Browse files
committedDec 7, 2023
Merge branch 'dev'
2 parents f0ba429 + dcf0005 commit 799e8df

File tree

6 files changed

+13
-6
lines changed

6 files changed

+13
-6
lines changed
 

‎CHANGELOG.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ helps make pymodbus a better product.
77

88
:ref:`Authors`: contains a complete list of volunteers have contributed to each major version.
99

10+
Version 3.6.2
11+
-------------
12+
* Set documentation to v3.6.2.
13+
1014
Version 3.6.1
1115
-------------
1216
* Solve pypi upload error.

‎MAKE_RELEASE.rst

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,23 @@ Making a release.
88
------------------------------------------------------------
99
Prepare/make release on dev.
1010
------------------------------------------------------------
11-
* Make pull request "prepare v3.5.x", with the following:
11+
* Make pull request "prepare v3.6.x", with the following:
1212
* Update pymodbus/__init__.py with version number (__version__ X.Y.Zpre)
1313
* Update README.rst "Supported versions"
1414
* Control / Update API_changes.rst
1515
* Update CHANGELOG.rst
1616
* Add commits from last release, but selectively !
17-
git log --oneline v3.5.3..HEAD > commit.log
18-
git log --pretty="%an" v3.0.0..HEAD | sort -uf > authors.log
17+
git log --oneline v3.6.1..HEAD > commit.log
18+
git log --pretty="%an" v3.6.1..HEAD | sort -uf > authors.log
1919
update AUTHORS
2020
cd doc; ./build_html
21+
* rm -rf build/* dist/*
22+
* python3 -m build
2123
* twine check dist/*
2224
* Commit, push and merge.
25+
* Wait for CI to complete
26+
* git pull
2327
* Checkout master locally
24-
* git pull dev
2528
* git merge dev
2629
* git push
2730
* git branch -D master

‎README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ PyModbus - A Python Modbus Stack
1111

1212
Pymodbus is a full Modbus protocol implementation offering client/server with synchronous/asynchronous API a well as simulators.
1313

14-
Current release is `3.6.0 <https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.6.0>`_.
14+
Current release is `3.6.2 <https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.6.2>`_.
1515

1616
Bleeding edge (not released) is `dev <https://github.com/pymodbus-dev/pymodbus/tree/dev>`_.
1717

‎doc/source/_static/examples.tgz

-20 Bytes
Binary file not shown.

‎doc/source/_static/examples.zip

0 Bytes
Binary file not shown.

‎pymodbus/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818
from pymodbus.pdu import ExceptionResponse
1919

2020

21-
__version__ = "3.6.1"
21+
__version__ = "3.6.2"
2222
__version_full__ = f"[pymodbus, version {__version__}]"

0 commit comments

Comments
 (0)
Please sign in to comment.