Bump version to 2.2.0rc1, update six requirements and Changelog

pymodbus-dev · Oct 7, 2019 · 507e8a0 · 507e8a0
1 parent cc6e976
commit 507e8a0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,3 +1,12 @@
+Version 2.3.0rc1
+-----------------------------------------------------------
+* Asyncio Server implementation (Python 3.7 and above only)
+* Bug fix for DiagnosticStatusResponse when odd sized response is received
+* Remove Pycrypto from dependencies and include cryptodome instead
+* Remove `SIX` requirement pinned to exact version.
+* Minor bug-fixes in documentations.
+
+
 Version 2.2.0
 -----------------------------------------------------------
 **NOTE: Supports python 3.7, async client is now moved to pymodbus/client/asychronous**

diff --git a/pymodbus/client/sync.py b/pymodbus/client/sync.py
@@ -424,7 +424,6 @@ def __init__(self, method='ascii', **kwargs):
         :param strict:  Use Inter char timeout for baudrates <= 19200 (adhere
         to modbus standards)
         """
-        import serial
         self.method = method
         self.socket = None
         BaseModbusClient.__init__(self, self.__implementation(method, self),

diff --git a/pymodbus/version.py b/pymodbus/version.py
@@ -41,7 +41,7 @@ def __str__(self):
         return '[%s, version %s]' % (self.package, self.short())
 
 
-version = Version('pymodbus', 2, 2, 0)
+version = Version('pymodbus', 2, 3, 0, "rc1")
 
 
 version.__name__ = 'pymodbus'  # fix epydoc error

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-six==1.11.0
+six>=1.11.0
 # -------------------------------------------------------------------
 # if want to use the pymodbus serial stack, uncomment these
 # -------------------------------------------------------------------