Merge pull request #89 from kumaran-ti/add_python_3_9_ccs_12_compatib…

…ility

Change to add python 3.9 & CCS 12 compatibility

hooks/pre-commit.sh

@@ -2,7 +2,7 @@
 
 echo "Running pre-commit hook"
 added_files=$(git diff --cached --name-only | grep "\.py" | tr '\n' ' ')
-if [ -n "${added_files// }" ]; then
+if [ -n "${added_files}" ]; then
     echo "running flake8 on ${added_files}"
     flake8 --exclude=__init__.py --ignore=E128 $added_files
     if [ $? -ne 0 ]; then

requirements.txt

@@ -0,0 +1 @@
+pyserial

tests/requirements.txt

@@ -1,2 +1,4 @@
 tox
 jinja2
+pytest
+pytest-html

tiflash/utils/result.py

@@ -20,7 +20,7 @@
 if pyversion[0] == 2:
     SOCK_TIMEOUT = None   # timeouts don't seem to work for py2
 else:
-    SOCK_TIMEOUT = 60   # timeout to wait for result
+    SOCK_TIMEOUT = 120   # timeout to wait for result #increased from 60 for CCS12 compatibility
 
 
 class ResultServerError(Exception):
@@ -83,11 +83,11 @@ def get_result(self, timeout=None):
                 If 'None' will block/wait forever. If '0' will not block.
 
         """
-        if self.server_thread.isAlive() is True:
+        if self.server_thread.is_alive() is True:
             self.server_thread.join(timeout=timeout)
 
             # Thread should only be alive if timeout was exceeded
-            if self.server_thread.isAlive is True:
+            if self.server_thread.is_alive is True:
                 return None
 
         if type(self.result) == str:

tiflash/version.py

@@ -1,3 +1,3 @@
-version = (1, 2, 9)
+version = (1, 3, 0)
 version_string = ".".join(map(str,version))
-release_date = "2019.08.23"
+release_date = "2022.07.05"