Merge branch 'dev'

Author: janiversen

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.1
+-------------
+* Solve pypi upload error.
+
 Version 3.6.0
 -------------
 * doc: Fix a code mismatch in client.rst

MAKE_RELEASE.rst

@@ -18,6 +18,7 @@ Prepare/make release on dev.
         git log --pretty="%an" v3.0.0..HEAD | sort -uf > authors.log
         update AUTHORS
         cd doc; ./build_html
+   * twine check dist/*
    * Commit, push and merge.
 * Checkout master locally
    * git pull dev
@@ -33,8 +34,8 @@ Prepare/make release on dev.
 * on local repo
    * git pull, check release tag is pulled
    * git checkout v3.0.0dev0
+   * rm -rf build/* dist/*
    * python3 -m build
-   * twine check dist/*
    * twine upload dist/*  (upload to pypi)
    * Double check Read me docs are updated
       * trigger build https://readthedocs.org/projects/pymodbus/builds/

README.rst

@@ -34,7 +34,7 @@ Pymodbus consist of 5 parts:
 
 Common features
 ^^^^^^^^^^^^^^^
-* Full :download:`modbus standard protocol <_static/Modbus_Application_Protocol_V1_1b3.pdf>` implementation
+* Full `modbus standard protocol <_static/Modbus_Application_Protocol_V1_1b3.pdf>`_ implementation
 * Support for custom function codes
 * support serial (rs-485), tcp, tls and udp communication
 * support all standard frames: socket, rtu, rtu-over-tcp, tcp and ascii

pymodbus/__init__.py

@@ -18,5 +18,5 @@
 from pymodbus.pdu import ExceptionResponse
 
 
-__version__ = "3.6.0"
+__version__ = "3.6.1"
 __version_full__ = f"[pymodbus, version {__version__}]"