Merge branch 'dev'

pymodbus-dev · Dec 7, 2023 · 799e8df · 799e8df
2 parents f0ba429 + dcf0005
commit 799e8df
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -7,6 +7,10 @@ helps make pymodbus a better product.
 
 :ref:`Authors`: contains a complete list of volunteers have contributed to each major version.
 
+Version 3.6.2
+-------------
+* Set documentation to v3.6.2.
+
 Version 3.6.1
 -------------
 * Solve pypi upload error.

diff --git a/MAKE_RELEASE.rst b/MAKE_RELEASE.rst
@@ -8,20 +8,23 @@ Making a release.
 ------------------------------------------------------------
 Prepare/make release on dev.
 ------------------------------------------------------------
-* Make pull request "prepare v3.5.x", with the following:
+* Make pull request "prepare v3.6.x", with the following:
    * Update pymodbus/__init__.py with version number (__version__ X.Y.Zpre)
    * Update README.rst "Supported versions"
    * Control / Update API_changes.rst
    * Update CHANGELOG.rst
       * Add commits from last release, but selectively !
-        git log --oneline v3.5.3..HEAD > commit.log
-        git log --pretty="%an" v3.0.0..HEAD | sort -uf > authors.log
+        git log --oneline v3.6.1..HEAD > commit.log
+        git log --pretty="%an" v3.6.1..HEAD | sort -uf > authors.log
         update AUTHORS
         cd doc; ./build_html
+   * rm -rf build/* dist/*
+   * python3 -m build
    * twine check dist/*
    * Commit, push and merge.
+   * Wait for CI to complete
+   * git pull
 * Checkout master locally
-   * git pull dev
    * git merge dev
    * git push
    * git branch -D master

diff --git a/README.rst b/README.rst
@@ -11,7 +11,7 @@ PyModbus - A Python Modbus Stack
 
 Pymodbus is a full Modbus protocol implementation offering client/server with synchronous/asynchronous API a well as simulators.
 
-Current release is `3.6.0 <https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.6.0>`_.
+Current release is `3.6.2 <https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.6.2>`_.
 
 Bleeding edge (not released) is `dev <https://github.com/pymodbus-dev/pymodbus/tree/dev>`_.
 

diff --git a/doc/source/_static/examples.tgz b/doc/source/_static/examples.tgz
diff --git a/doc/source/_static/examples.zip b/doc/source/_static/examples.zip
diff --git a/pymodbus/__init__.py b/pymodbus/__init__.py
@@ -18,5 +18,5 @@
 from pymodbus.pdu import ExceptionResponse
 
 
-__version__ = "3.6.1"
+__version__ = "3.6.2"
 __version_full__ = f"[pymodbus, version {__version__}]"