Fixed jls version check in record.

jetperch · Apr 20, 2023 · bcf2fb6 · bcf2fb6
1 parent ec2b4a9
commit bcf2fb6
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@
 This file contains the list of changes made to the Joulescope driver.
 
 
+## 1.3.4
+
+2023 Apr 20 [in progress]
+
+* Fixed record jls version check.
+
+
 ## 1.3.3
 
 2023 Apr 19

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(JOULESCOPE_DRIVER
-        VERSION 1.3.3
+        VERSION 1.3.4
         LANGUAGES C)
 SET(PROJECT_PREFIX JSDRV)
 SET(VERSION_STRING "${PROJECT_VERSION}")

diff --git a/include/jsdrv/version.h b/include/jsdrv/version.h
@@ -59,7 +59,7 @@
  *
  * Changes in the patch version indicate bug fixes and improvements.
  */
-#define JSDRV_VERSION_PATCH 3
+#define JSDRV_VERSION_PATCH 4
 
 /**
  * \brief The maximum version string length.

diff --git a/pyjoulescope_driver/record.py b/pyjoulescope_driver/record.py
@@ -135,7 +135,7 @@ def __init__(self, driver, device_path, signals=None):
         if Writer is None:
             raise RuntimeError('pyjls package not found.  Install using:\n' +
                                '  pip3 install -U pyjls')
-        pyjls_version = [int(x) for x in __version__.split('.')]
+        pyjls_version = tuple([int(x) for x in __version__.split('.')])
         if pyjls_version < _PYJLS_VERSION_MIN or pyjls_version >= _PYJLS_VERSION_MAX:
             raise ImportError(f'Unsupported pyjls version {__version__}\n' +
                               f'  Require {_PYJLS_VERSION_MIN} <= pyjls version < {_PYJLS_VERSION_MAX}\n' +

diff --git a/pyjoulescope_driver/version.py b/pyjoulescope_driver/version.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
-__version__ = "1.3.3"
+__version__ = "1.3.4"
 
 __title__ = "pyjoulescope_driver"
 __description__ = 'Joulescope™ driver'