quarchpy 2.1.13.dev2__py2.py3-none-any.whl → 2.1.14.dev2__py2.py3-none-any.whl

quarchpy/connection_specific/connection_TCP.py

@@ -14,7 +14,7 @@ class TCPConn:
         self.Connection = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         #Sets buffer size
         self.BufferSize = 4096
-        #Opens the ocnnection
+        #Opens the connection
         self.Connection.connect((self.ConnTarget, TCP_PORT))
 
     def close(self):

quarchpy/connection_specific/connection_mDNS.py

@@ -0,0 +1,46 @@
+from zeroconf import Zeroconf
+
+
+class MyListener:
+    def __init__(self):
+        self.found_devices = {}
+
+    def update_service(self, zc: Zeroconf, type_: str, name: str) -> None:
+        return None
+
+    def remove_service(self, zc: Zeroconf, type_: str, name: str) -> None:
+        print("hello")
+        info = zc.get_service_info(type_, name)
+        if "Quarch:" in str(info):
+            decoded_properties = {key.decode('utf-8'): value.decode('utf-8') for key, value in info.properties.items()}
+            qtl_num = "QTL" + decoded_properties['86'] if '86' in decoded_properties else None
+            for key, value in self.found_devices:
+                if value == qtl_num:
+                    print("item deleted")
+                    print(self.found_devices)
+                    del self.found_devices[key]
+
+    def add_service(self, zc: Zeroconf, type_: str, name: str) -> None:
+        info = zc.get_service_info(type_, name)
+        if "Quarch:" in str(info):
+            # decode the incoming properties from mdns
+            decoded_properties = {key.decode('utf-8'): value.decode('utf-8') for key, value in info.properties.items()}
+            decoded_ip = ".".join(str(byte) for byte in info.addresses[0])
+            self.add_device(decoded_properties, decoded_ip)
+
+    def add_device(self, properties_dict, ip_address):
+        qtl_num = "QTL" + properties_dict['86'] if '86' in properties_dict else None
+        if '84' in properties_dict:
+            if properties_dict['84'] == '80':
+                # print("Rest connection exists for device: " + qtl_num)
+                self.update_device_dict(device_dict={"REST:" + ip_address: qtl_num})
+        if '85' in properties_dict:
+            if properties_dict['85'] == "9760":
+                # print("TCP connection exists for device: " + qtl_num)
+                self.update_device_dict(device_dict={"TCP:" + ip_address: qtl_num})
+
+    def update_device_dict(self, device_dict):
+        self.found_devices.update(device_dict)
+
+
+listener = MyListener()

quarchpy/device/quarchPPM.py

@@ -12,8 +12,8 @@ class quarchPPM(quarchDevice):
         if numb_colons == 1:
             self.ConString = self.ConString.replace(':', '::')
  
-    def startStream(self, fileName='streamData.txt', fileMaxMB=200000, streamName ='Stream With No Name', streamDuration = None, streamAverage = None, releaseOnData = False, separator=","):
-        return self.connectionObj.qis.startStream(self.ConString, fileName, fileMaxMB, streamName, streamAverage, releaseOnData, separator, streamDuration)
+    def startStream(self, fileName='streamData.txt', fileMaxMB=200000, streamName ='Stream With No Name', streamDuration = None, streamAverage = None, releaseOnData = False, separator=",", inMemoryData = None):
+        return self.connectionObj.qis.startStream(self.ConString, fileName, fileMaxMB, streamName, streamAverage, releaseOnData, separator, streamDuration, inMemoryData)
 
     def streamRunningStatus(self):
         return self.connectionObj.qis.streamRunningStatus(self.ConString)

quarchpy/device/quarchQPS.py

@@ -1,5 +1,6 @@
 from quarchpy.device import quarchDevice
 from quarchpy.qps import toQpsTimeStamp
+from quarchpy.utilities.Version import Version
 import os, time, datetime, sys, logging
 
 if sys.version_info[0] < 3:
@@ -7,19 +8,19 @@ if sys.version_info[0] < 3:
 else:
     from io import StringIO
 
-current_milli_time = lambda: int (round (time.time() * 1000))
-current_second_time = lambda: int (round (time.time()))
+current_milli_time = lambda: int(round(time.time() * 1000))
+current_second_time = lambda: int(round(time.time()))
+
 
 # Using standard Unix time,  milliseconds since the epoch (midnight 1 January 1970 UTC)
 # Should avoid issues with time zones and summer time correction but the local and host
 # clocks should still be synchronised
 def qpsNowStr():
-    return current_milli_time()                          # datetime supports microseconds
+    return current_milli_time()  # datetime supports microseconds
 
 
 class quarchQPS(quarchDevice):
     def __init__(self, quarchDevice):
-
         self.quarchDevice = quarchDevice
         self.ConType = quarchDevice.ConType
         self.ConString = quarchDevice.ConString
@@ -33,13 +34,10 @@ class quarchQPS(quarchDevice):
         directory - str - desired stream dir
         unserInput=True - if a failure occurs userInput=True allows user to rectify problem with user input. set to False if user interaction is not available (automating).
         """
-        time.sleep(1) #TODO remove this sleep once script->QPS timeing issue resolved. This works fine in the meantime
+        time.sleep(1)  # TODO remove this sleep once script->QPS timeing issue resolved. This works fine in the meantime
         return quarchStream(self.quarchDevice, directory, unserInput)
 
 
-
-    
-
 class quarchStream:
     def __init__(self, quarchQPS, directory, unserInput=True):
         self.connectionObj = quarchQPS.connectionObj
@@ -59,21 +57,23 @@ class quarchStream:
 
     def startQPSStream(self, newDirectory):
         '''STARTS the stream '''
-        response = self.connectionObj.qps.sendCmdVerbose("$start stream \"" + str(newDirectory)+"\"")
+        response = self.connectionObj.qps.sendCmdVerbose("$start stream \"" + str(newDirectory) + "\"")
+        if "Error" in response:
+            response = self.connectionObj.qps.sendCmdVerbose("$start stream " + str(newDirectory))
         return response
 
     def failCheck(self, response):
         ''' handles failed starting of stream that requires input from user to fix.'''
         while "fail:" in response.lower():
             if "Fail: Directory already exists" in response:
-                print (response)
+                print(response)
                 print("Please enter a new file name:")
-                if sys.version_info.major==3:
+                if sys.version_info.major == 3:
                     newDir = input()
                 else:
                     newDir = raw_input()
-                response = self.startQPSStream( newDir)
-            else:  #  If its a failure we don't know how to handle.
+                response = self.startQPSStream(newDir)
+            else:  # If its a failure we don't know how to handle.
                 raise Exception(response)
         return response
 
@@ -93,22 +93,23 @@ class quarchStream:
         if format == "df":
             try:
                 import warnings
+                import pandas as pd
                 warnings.simplefilter(action='ignore', category=FutureWarning)
-                if 'pandas' in sys.modules or 'pd' in sys.modules:
-                    logging.debug("Pandas already imported.")
-                else:
-                    import pandas as pd
-                pd.set_option('display.max_columns', None)
-                pd.set_option('display.width', 1024)
             except Exception as e:
                 logging.error(e)
                 logging.warning("pandas not imported correctly. Continuing")
-                pass
+            pd.set_option('display.max_columns', None)
+            pd.set_option('display.width', 1024)
             test_data = StringIO(command_response)
-            retVal = pd.read_csv(test_data, sep=",", header=[0, 1], error_bad_lines=False)
+
+            # pandas.read_csv() replaced error_bad_lines with on_bad_lines from v1.3.0
+            if Version.is_v1_ge_v2(pd.__version__, "1.3.0"):
+                retVal = pd.read_csv(test_data, sep=",", header=[0, 1], on_bad_lines="skip")
+            else:
+                retVal = pd.read_csv(test_data, sep=",", header=[0, 1], error_bad_lines=False)
         elif format == "list":
             retVal = []
-            for line in command_response.replace("\r\n","\n").split("\n"):
+            for line in command_response.replace("\r\n", "\n").split("\n"):
                 row = []
                 for element in line.split(","):
                     row.append(element)
@@ -116,7 +117,6 @@ class quarchStream:
 
         return retVal
 
-
     def stats_to_CSV(self, file_name=""):
         """
         Saves the statistics grid to a csv file
@@ -132,7 +132,7 @@ class quarchStream:
 
                         The response text from QPS. If successful "ok. Saving stats to : file_name" otherwise returns the exception thrown
         """
-        command_response = self.connectionObj.qps.sendCmdVerbose("$stats to csv \""+file_name+"\"", timeout=60)
+        command_response = self.connectionObj.qps.sendCmdVerbose("$stats to csv \"" + file_name + "\"", timeout=60)
         if command_response.startswith("Fail"):
             raise Exception(command_response)
         return command_response
@@ -158,22 +158,24 @@ class quarchStream:
         """
         try:
             import warnings
+            import pandas as pd
             warnings.simplefilter(action='ignore', category=FutureWarning)
-            if 'pandas' in sys.modules or 'pd' in sys.modules:
-                logging.debug("Pandas already imported.")
-            else:
-                import pandas as pd
-            pd.set_option('max_columns', None)
-            pd.set_option('display.width', 1024)
         except:
             logging.warning("pandas not imported correctly")
-            pass
-        command_response = self.connectionObj.qps.sendCmdVerbose("$get custom stats range " + str(start_time)+ " " + str(end_time), timeout=60)
+        command_response = self.connectionObj.qps.sendCmdVerbose(
+            "$get custom stats range " + str(start_time) + " " + str(end_time), timeout=60)
         if command_response.startswith("Fail"):
             raise Exception(command_response)
         test_data = StringIO(command_response)
         try:
-            df = pd.read_csv(test_data, sep=",", header=[0,1])
+            pd.set_option('display.max_columns', None)
+            pd.set_option('display.width', 1024)
+            # df = pd.read_csv(test_data, sep=",", header=[0,1])
+            # pandas.read_csv() replaced error_bad_lines with on_bad_lines from v1.3.0
+            if Version.is_v1_ge_v2(pd.__version__, "1.3.0"):
+                df = pd.read_csv(test_data, sep=",", header=[0, 1], on_bad_lines="skip")
+            else:
+                df = pd.read_csv(test_data, sep=",", header=[0, 1], error_bad_lines=False)
         except Exception as e:
             logging.error("Unable to create pandas data frame from command response :" + str(command_response))
             raise e
@@ -186,7 +188,7 @@ class quarchStream:
         command_response = self.connectionObj.qps.sendCmdVerbose("$take snapshot")
         if command_response.startswith("Fail"):
             raise Exception(command_response)
-        return(command_response)
+        return (command_response)
 
     def getStreamState(self):
         """
@@ -198,9 +200,10 @@ class quarchStream:
         command_response = self.connectionObj.qps.sendCmdVerbose("$stream state")
         if command_response.startswith("Fail"):
             raise Exception(command_response)
-        return(command_response)
+        return (command_response)
 
-    def addAnnotation(self, title, annotationTime = 0, extraText="", yPos="", titleColor ="", annotationColor = "", annotationType = "", annotationGroup =""):
+    def addAnnotation(self, title, annotationTime=0, extraText="", yPos="", titleColor="", annotationColor="",
+                      annotationType="", annotationGroup=""):
         """
                     Adds a custom annotation to stream with given parameters.
 
@@ -232,7 +235,7 @@ class quarchStream:
         if annotationType == "" or annotationType == "annotation":
             annotationType = "annotate"
         elif annotationType == "comment":
-            pass # already in the correct format for command
+            pass  # already in the correct format for command
         else:
             retString = "Fail annotationType must be 'annotation' or 'comment'"
             logging.warning(retString)
@@ -247,14 +250,13 @@ class quarchStream:
             if annotationTime == "0":
                 # Use current time
                 annotationTime = qpsNowStr()
-            elif(annotationTime.startswith("e")):
+            elif (annotationTime.startswith("e")):
                 pass
             else:
                 # Convert timestamp to QPS format
-                #annotationTime = toQpsTimeStamp(annotationTime)
+                # annotationTime = toQpsTimeStamp(annotationTime)
                 annotationTime = str(annotationTime)
 
-
             if title != "":
                 annotationString += "<text>" + str(title) + "</text>"
             if extraText != "":
@@ -272,16 +274,20 @@ class quarchStream:
         # command is sent on newline so \n needs to be chnaged to \\n which is changed back just before printing in qps.
         annotationString = annotationString.replace("\n", "\\n")
         logging.debug("Time sending to QPS:" + str(annotationTime))
-        return self.connectionObj.qps.sendCmdVerbose("$" +annotationType+" "+str(annotationTime)+" "+annotationString)
+        return self.connectionObj.qps.sendCmdVerbose(
+            "$" + annotationType + " " + str(annotationTime) + " " + annotationString)
 
-    def addComment(self, title, commentTime = 0, extraText="", yPos="", titleColor ="", commentColor = "", annotationType = "", annotationGroup =""):
-        #Comments are just annotations that do not affect the statistics grid.
-        #This function was kept to be backwards compatible and is a simple pass through to add annotation.
+    def addComment(self, title, commentTime=0, extraText="", yPos="", titleColor="", commentColor="", annotationType="",
+                   annotationGroup=""):
+        # Comments are just annotations that do not affect the statistics grid.
+        # This function was kept to be backwards compatible and is a simple pass through to add annotation.
         if annotationType == "":
             annotationType = "comment"
-        return self.addAnnotation(title = title, annotationTime=commentTime, extraText=extraText, yPos=yPos, titleColor=titleColor, annotationColor=commentColor, annotationType=annotationType, annotationGroup=annotationGroup)
+        return self.addAnnotation(title=title, annotationTime=commentTime, extraText=extraText, yPos=yPos,
+                                  titleColor=titleColor, annotationColor=commentColor, annotationType=annotationType,
+                                  annotationGroup=annotationGroup)
 
-    def saveCSV(self,filePath, linesPerFile=None, cr=None, delimiter=None, timeout=60):
+    def saveCSV(self, filePath, linesPerFile=None, cr=None, delimiter=None, timeout=60):
         """
             Saves the stream to csv file at specified location
 
@@ -306,26 +312,27 @@ class quarchStream:
         args = ""
 
         if linesPerFile != None:
-            args +=" -l" + str(linesPerFile)
-        if cr !=None:
+            args += " -l" + str(linesPerFile)
+        if cr != None:
             if cr is True:
-                args+= " -cyes"
+                args += " -cyes"
             elif cr is False:
                 args += " -cno"
-        if delimiter !=None:
-            args += " -s"+delimiter
+        if delimiter != None:
+            args += " -s" + delimiter
 
-        #, filePath, linesPerFile, cr, delimiter
+        # , filePath, linesPerFile, cr, delimiter
         return self.connectionObj.qps.sendCmdVerbose("$save csv \"" + filePath + "\" " + args, timeout=timeout)
 
     def createChannel(self, channelName, channelGroup, baseUnits, usePrefix):
-        #Conditions to convert false / true inputs to specification input
-        if usePrefix == False: 
+        # Conditions to convert false / true inputs to specification input
+        if usePrefix == False:
             usePrefix = "no"
         if usePrefix == True:
             usePrefix = "yes"
 
-        return self.connectionObj.qps.sendCmdVerbose("$create channel " + channelName + " " + channelGroup  + " " + baseUnits + " " + usePrefix)
+        return self.connectionObj.qps.sendCmdVerbose(
+            "$create channel " + channelName + " " + channelGroup + " " + baseUnits + " " + usePrefix)
 
     def hideChannel(self, channelSpecifier):
         return self.connectionObj.qps.sendCmdVerbose("$hide channel " + channelSpecifier)
@@ -338,7 +345,7 @@ class quarchStream:
 
     def channels(self):
         return self.connectionObj.qps.sendCmdVerbose("$channels").splitlines()
-             
+
     def stopStream(self):
         return self.connectionObj.qps.sendCmdVerbose("$stop stream")
 
@@ -346,37 +353,37 @@ class quarchStream:
         self.stopStream()
         streamState = self.getStreamState().lower()
         while "running" in streamState:
-            logging.debug("Stream buffer still emptying: "+ streamState)
+            logging.debug("Stream buffer still emptying: " + streamState)
             time.sleep(checkInterval)
             streamState = self.getStreamState().lower()
         logging.debug("QPS no longer Streaming: " + streamState)
 
     def hideAllDefaultChannels(self):
-    	
-    	#TODO query QPS / Device for all channel names and hide all of them
-    	#All Default Channels
-        self.hideChannel ("3.3v:voltage")
-        self.hideChannel ("3v3:voltage")
-        self.hideChannel ("5v:voltage")
-        self.hideChannel ("12v:voltage")
-        self.hideChannel ("3v3:current")
-        self.hideChannel ("3.3v:current")
-        self.hideChannel ("5v:current")
-        self.hideChannel ("12v:current")
-        self.hideChannel ("3v3:power")
-        self.hideChannel ("3.3v:power")
-        self.hideChannel ("5v:power")
-        self.hideChannel ("12v:power")
-        self.hideChannel ("tot:power")
-        #Default PAM channels
-        self.hideChannel ("perst#:digital")
-        self.hideChannel ("wake#:digital")
-        self.hideChannel ("lkreq#:digital")
-        self.hideChannel ("smclk:digital")
-        self.hideChannel ("smdat:digital")
-    
-    #function to add a data point the the stream
-    #time value will default to current time if none passed
+
+        # TODO query QPS / Device for all channel names and hide all of them
+        # All Default Channels
+        self.hideChannel("3.3v:voltage")
+        self.hideChannel("3v3:voltage")
+        self.hideChannel("5v:voltage")
+        self.hideChannel("12v:voltage")
+        self.hideChannel("3v3:current")
+        self.hideChannel("3.3v:current")
+        self.hideChannel("5v:current")
+        self.hideChannel("12v:current")
+        self.hideChannel("3v3:power")
+        self.hideChannel("3.3v:power")
+        self.hideChannel("5v:power")
+        self.hideChannel("12v:power")
+        self.hideChannel("tot:power")
+        # Default PAM channels
+        self.hideChannel("perst#:digital")
+        self.hideChannel("wake#:digital")
+        self.hideChannel("lkreq#:digital")
+        self.hideChannel("smclk:digital")
+        self.hideChannel("smdat:digital")
+
+    # function to add a data point the the stream
+    # time value will default to current time if none passed
     def addDataPoint(self, channelName, groupName, dataValue, dataPointTime=0, timeFormat="unix"):
         '''
         channelName - str
@@ -388,9 +395,11 @@ class quarchStream:
         if dataPointTime == None or dataPointTime == 0:
             dataPointTime = qpsNowStr()
         else:
-            dataPointTime = toQpsTimeStamp (dataPointTime)
+            dataPointTime = toQpsTimeStamp(dataPointTime)
 
-        #print ("printing command:  $log " + channelName + " " + groupName + " " + str(dataPointTime) + " " + str(dataValue))
-        #self.connectionObj.qps.sendCmdVerbose("$log " + channelName + " " + groupName + " " + str(dataPointTime) + " " + str(dataValue))
+        # print ("printing command:  $log " + channelName + " " + groupName + " " + str(dataPointTime) + " " + str(dataValue))
+        # self.connectionObj.qps.sendCmdVerbose("$log " + channelName + " " + groupName + " " + str(dataPointTime) + " " + str(dataValue))
 
-        self.connectionObj.qps.sendCmdVerbose("$stream data add " + channelName+ " " + groupName+ " " + str(dataPointTime)+ " " + str(dataValue)+ " " + timeFormat)
+        self.connectionObj.qps.sendCmdVerbose(
+            "$stream data add " + channelName + " " + groupName + " " + str(dataPointTime) + " " + str(
+                dataValue) + " " + timeFormat)

quarchpy/device/scanDevices.py

@@ -20,6 +20,9 @@ from quarchpy.connection_specific.connection_Serial import serialList, serial
 from quarchpy.device.quarchArray import isThisAnArrayController
 from quarchpy.connection_specific.connection_USB import TQuarchUSB_IF
 from quarchpy.connection_specific import connection_ReST
+from quarchpy.connection_specific.connection_mDNS import MyListener
+
+from zeroconf import ServiceBrowser, Zeroconf
 
 # TODO: bodge bodge bodge
 from quarchpy.utilities import TestCenter
@@ -455,6 +458,11 @@ def filter_module_type(module_type_filter, found_devices):
                 filtered_devices.update({key: value})
     return filtered_devices
 
+def scan_mDNS(mdnsListener):
+    zeroconf = Zeroconf()
+    listener = mdnsListener
+    browser = ServiceBrowser(zeroconf, "_http._tcp.local.", listener)
+
 
 '''
 Scans for Quarch modules across the given interface(s). Returns a dictionary of module addresses and serial numbers
@@ -463,6 +471,9 @@ def scanDevices(target_conn="all", lanTimeout=1, scanInArray=True, favouriteOnly
                 module_type_filter=None, ipAddressLookup=None):
     foundDevices = dict()
     scannedArrays = list()
+    mdnsListener = MyListener()
+
+    scan_mDNS(mdnsListener)
 
     if target_conn.lower() == "all":
         foundDevices = list_USB()
@@ -470,6 +481,7 @@ def scanDevices(target_conn="all", lanTimeout=1, scanInArray=True, favouriteOnly
         try:
             #This will fail if the test machine is not connected to a network
             foundDevices = mergeDict(foundDevices, list_network("all", ipAddressLookup=ipAddressLookup, lanTimeout=lanTimeout))
+            foundDevices = mergeDict(foundDevices, mdnsListener.found_devices)
         except Exception as e:
             logging.error(e)
             logging.warning("Network scan failed, check network connection")

quarchpy/docs/CHANGES.rst

@@ -13,11 +13,17 @@ Quarchpy
 Change Log
 ----------
 
+2.1.13
+------
+- New QPS v1.36
+- New QIS v1.39
+- minor bug fixes and logging improvements.
+
 2.1.12
 ------
 - New QPS v1.35
 - New QIS v1.38
-- minor bug fixes and removal of depricated code.
+- minor bug fixes and removal of depracated code.
 
 2.1.11
 ------

quarchpy/qps/qpsFuncs.py

@@ -85,16 +85,19 @@ def startLocalQps(keepQisRunning=False, args=[]):
 
     currentOs = platform.system()
 
-    if (currentOs in "Windows"):
-        command = "start /high /b javaw -Djava.awt.headless=true " + command +" " + str(args)
+    if currentOs in "Windows":
+        command = "start /high /b javaw -Djava.awt.headless=true " + command + " " + str(args)
+        command = command + "-ccs=HIDE"  # note: multiple -ccs options ignored
         os.system(command)
-    elif (currentOs in "Linux"):
+    elif currentOs in "Linux":
+        command = command + "-ccs=HIDE"
         if sys.version_info[0] < 3:
             os.popen2("java " + command + " 2>&1")
         else:
             os.popen("java " + command + " 2>&1")
-    else:
+    else:  # default to Windows
         command = "start /high /b javaw -Djava.awt.headless=true " + command + " " + str(args)
+        command = command + "-ccs=HIDE"
         os.system(command)
 
     while not isQpsRunning():

quarchpy/run.py

@@ -20,7 +20,7 @@ def main(args):
     """
    
     # Run the internal parser
-    _parse_run_options(args)
+    _parse_run_options(args)  
 
 def _parse_run_options(args):
     """

quarchpy/user_interface/user_interface.py.bak

@@ -10,7 +10,6 @@ and support for both terminal and TestCenter (quarch internal) execution
 # Needed for python2 compatibility
 # coding: utf-8
 from __future__ import print_function
-import tempfile
 
 import traceback, sys, os, math, logging
 from quarchpy.utilities import TestCenter
@@ -240,7 +239,7 @@ prints a message to the user and waits for acknowledgement
 def showDialog(message="",title=""):
 
 
-    if User_interface.instance != None and User_interface.instance.selectedInterface == "testcenter":
+        if User_interface.instance != None and User_interface.instance.selectedInterface == "testcenter":
             TestCenter.testPoint ("Quarch_Host.ShowDialog","Title=" + __formatForTestcenter(title),"Message=" + __formatForTestcenter(message), stack_level=2)
 
     else:
@@ -406,7 +405,7 @@ logResults(test,notes)
 '''
 def logResults(test, notes):
 
-    if User_interface.instance != None and User_interface.instance.selectedInterface == "testcenter":
+        if User_interface.instance != None and User_interface.instance.selectedInterface == "testcenter":
             TestCenter.testPoint ("Quarch_Internal.ResultDialog","Test="+ __formatForTestcenter(test),"Notes=" + __formatForTestcenter(notes), stack_level=2)
 
     else:
@@ -702,8 +701,7 @@ def get_check_valid_calPath(calPath, message="Enter the desired save path for th
 def check_path_write_permissions(path, message="Please enter a valid path with write permissions: "):
     import tempfile, errno
     valid_path=False
-    # Create a temporary directory
-    calPath = tempfile.mkdtemp()
+    calPath = os.path.expanduser("~")
     while valid_path==False:
         try:
             if path==None:

quarchpy/utilities/TestCenter.py

@@ -1,4 +1,4 @@
-	#!/usr/bin/python
+#!/usr/bin/python
 """
 Implements the standard TestCenter API for Python, allowing a Python script to execute all TestCenter functions.
 This is Quarch internal use only.  Each function uses the stdin/stdout to communicate with the TestCenter process

quarchpy/utilities/TestCenter.py.bak

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+	#!/usr/bin/python
 """
 Implements the standard TestCenter API for Python, allowing a Python script to execute all TestCenter functions.
 This is Quarch internal use only.  Each function uses the stdin/stdout to communicate with the TestCenter process
@@ -63,9 +63,6 @@ def testPoint (command_name, *command_params, stack_level=1):
 
     """  
 
-    # user_interface adds an extra level to the stack.
-    # TODO: This is non-optimal, perhaps some parameter or targetted test could be used instead
-    # to avoid failing a try/except on every test point? Why is this the only TestCenter function that has this check?
     caller = getframeinfo(stack()[stack_level][0])
 
 

quarchpy/utilities/Version.py

@@ -0,0 +1,50 @@
+"""
+A utility class for versioning.
+"""
+
+import re
+
+try:
+    from typing import List
+except ImportError:
+    List = list  # For Python 2 compatibility
+
+class Version:
+    """
+    Support for Python package version numbering.
+    """
+
+    @staticmethod
+    def major_number(version_number_string):
+        """ Returns the version major number. """
+        major = int(Version.major_minor_patch_numbers(version_number_string)[0])
+        return major
+
+    @staticmethod
+    def minor_number(version_number_string):
+        """ Returns the version minor number. """
+        minor = int(Version.major_minor_patch_numbers(version_number_string)[1])
+        return minor
+
+    @staticmethod
+    def patch_number(version_number_string):
+        """ Returns the version patch number. """
+        patch = int(Version.major_minor_patch_numbers(version_number_string)[2])
+        return patch
+
+    @staticmethod
+    def major_minor_patch_numbers(version_number_string):
+        """ Returns the version patch number. """
+        v_list = re.split(r"\.", version_number_string)
+        return v_list
+
+    @staticmethod
+    def is_v1_ge_v2(v1, v2):
+        """ Returns true if v1 >= v2, else false. """
+        v1_version_list = Version.major_minor_patch_numbers(v1)
+        v2_version_list = Version.major_minor_patch_numbers(v2)
+        v1_version_number = int(''.join(v1_version_list))
+        v2_version_number = int(''.join(v2_version_list))
+        if v1_version_number >= v2_version_number:
+            return True
+        return False

{quarchpy-2.1.13.dev2.dist-info → quarchpy-2.1.14.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: quarchpy
-Version: 2.1.13.dev2
+Version: 2.1.14.dev2
 Summary: This packpage offers Python support for Quarch Technology modules.
 Author: Quarch Technology ltd
 Author-email: support@quarch.com
@@ -33,11 +33,17 @@ Quarchpy
 Change Log
 ----------
 
+2.1.13
+------
+- New QPS v1.36
+- New QIS v1.39
+- minor bug fixes and logging improvements.
+
 2.1.12
 ------
 - New QPS v1.35
 - New QIS v1.38
-- minor bug fixes and removal of depricated code.
+- minor bug fixes and removal of depracated code.
 
 2.1.11
 ------