quarchpy 2.2.1.dev2__py2.py3-none-any.whl → 2.2.1.dev3__py2.py3-none-any.whl

quarchpy/_version.py

@@ -1 +1 @@
-__version__ = "2.2.1.dev2"
+__version__ = "2.2.1.dev3"

quarchpy/qis/qisFuncs.py

@@ -98,6 +98,14 @@ def startLocalQis(terminal=False, headless=False, args=None, timeout=20):
 
     # OS
     current_os = platform.system()
+    current_arch = platform.machine()
+    current_arch = current_arch.lower()  # ensure comparing same case
+
+    # Currently officially unsupported
+    if (current_os in "Linux" and current_arch == "aarch64") or (current_os in "Darwin" and current_arch == "arm64"):
+        logging.warning("The system [" + current_os + ", " + current_arch + "] is not officially supported.")
+        logging.warning("Please contact Quarch support for running QuarchPy on this system.")
+        return
 
     # ensure the jres folder has the required permissions
     permissions,message= find_java_permissions()
@@ -127,10 +135,14 @@ def startLocalQis(terminal=False, headless=False, args=None, timeout=20):
     else:
         if current_os in "Windows":
             qis_path = os.path.join(qis_path, "connection_specific", "QPS", "win-amd64", "qis", "qis.jar")
-        elif current_os in "Linux":
+        elif current_os in "Linux" and current_arch == "x86_64":
             qis_path = os.path.join(qis_path, "connection_specific", "QPS", "lin-amd64", "qis", "qis.jar")
-        elif current_os in "Darwin":
+        elif current_os in "Linux" and current_arch == "aarch64":
+            qis_path = os.path.join(qis_path, "connection_specific", "QPS", "lin-arm64", "qis", "qis.jar")
+        elif current_os in "Darwin" and current_arch == "x86_64":
             qis_path = os.path.join(qis_path, "connection_specific", "QPS", "mac-amd64", "qis", "qis.jar")
+        elif current_os in "Darwin" and current_arch == "arm64":
+            qis_path = os.path.join(qis_path, "connection_specific", "QPS", "mac-arm64", "qis", "qis.jar")
         else:  # default to windows
             qis_path = os.path.join(qis_path, "connection_specific", "QPS", "win-amd64", "qis", "qis.jar")
 
@@ -171,16 +183,25 @@ def startLocalQis(terminal=False, headless=False, args=None, timeout=20):
     # different start for different OS
     if current_os == "Windows":
         command = java_path + "\\win_amd64_jdk_21_jre\\bin\\" + command
-    elif current_os == "Linux":
+    elif current_os == "Linux" and current_arch == "x86_64":
         command = java_path + "/lin_amd64_jdk_21_jre/bin/" + command
-    elif current_os == "Darwin":
+    elif current_os == "Linux" and current_arch == "aarch64":
+        command = java_path + "/lin_arm64_jdk_21_jre/bin/" + command
+    elif current_os == "Darwin" and current_arch == "x86_64":
         command = java_path + "/mac_amd64_jdk_21_jre/bin/" + command
+    elif current_os == "Darwin" and current_arch == "arm64":
+        command = java_path + "/mac_arm64_jdk_21_jre/bin/" + command
     else:  # default to windows
         command = java_path + "\\win_amd64_jdk_21_jre\\bin\\" + command
 
     # Use the command and check QIS has launched
     if "-logging=ON" in str(args): #If logging to a terminal window is on then os.system should be used to view logging.
         process = subprocess.Popen(command,shell=True)
+        startTime = time.time() #Checks for Popen launch only
+        while not isQisRunning():
+            if time.time() - startTime > timeout:
+                raise TimeoutError("QIS failed to launch within timelimit of " + str(timeout) + " sec.")
+            pass
     else:
         if sys.version_info[0] < 3:
             process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)

quarchpy/qps/qpsFuncs.py

@@ -93,6 +93,14 @@ def startLocalQps(keepQisRunning=False, args=[], timeout=30, startQPSMinimised=T
 
     # Check the current OS
     current_os = platform.system()
+    current_arch = platform.machine()
+    current_arch = current_arch.lower()  # ensure comparing same case
+
+    # Currently officially unsupported
+    if (current_os in "Linux" and current_arch == "aarch64") or (current_os in "Darwin" and current_arch == "arm64"):
+        logging.warning("The system [" + current_os + ", " + current_arch + "] is not officially supported.")
+        logging.warning("Please contact Quarch support for running QuarchPy on this system.")
+        return
 
     # ensure the jres folder has the required permissions
     permissions, message = find_java_permissions()
@@ -117,10 +125,14 @@ def startLocalQps(keepQisRunning=False, args=[], timeout=30, startQPSMinimised=T
     else: # Different QPS.jar for each OS
         if current_os in "Windows":
             qps_path = os.path.join(qps_path, "connection_specific", "QPS", "win-amd64", "qps.jar")
-        elif current_os in "Linux":
+        elif current_os in "Linux" and current_arch == "x86_64":
             qps_path = os.path.join(qps_path, "connection_specific", "QPS", "lin-amd64", "qps.jar")
-        elif current_os in "Darwin":
+        elif current_os in "Linux" and current_arch == "aarch64":
+            qps_path = os.path.join(qps_path, "connection_specific", "QPS", "lin-arm64", "qps.jar")
+        elif current_os in "Darwin" and current_arch == "x86_64":
             qps_path = os.path.join(qps_path, "connection_specific", "QPS", "mac-amd64", "qps.jar")
+        elif current_os in "Darwin" and current_arch == "arm64":
+            qps_path = os.path.join(qps_path, "connection_specific", "QPS", "mac-arm64", "qps.jar")
         else:  # default to windows
             qps_path = os.path.join(qps_path, "connection_specific", "QPS", "win-amd64", "qps.jar")
 
@@ -131,10 +143,14 @@ def startLocalQps(keepQisRunning=False, args=[], timeout=30, startQPSMinimised=T
     # OS dependency
     if current_os in "Windows":
         command = java_path + "\\win_amd64_jdk_21_jre\\bin\\java -jar qps.jar " + str(args)
-    elif current_os in "Linux":
+    elif current_os in "Linux" and current_arch == "x86_64":
         command = java_path + "/lin_amd64_jdk_21_jre/bin/java -jar qps.jar " + str(args)
-    elif current_os in "Darwin":
+    elif current_os in "Linux" and current_arch == "aarch64":
+        command = java_path + "/lin_arm64_jdk_21_jre/bin/java -jar qps.jar " + str(args)
+    elif current_os in "Darwin" and current_arch == "x86_64":
         command = java_path + "/mac_amd64_jdk_21_jre/bin/java -jar qps.jar " + str(args)
+    elif current_os in "Darwin" and current_arch == "arm64":
+        command = java_path + "/mac_arm64_jdk_21_jre/bin/java -jar qps.jar " + str(args)
     else:  # default to windows
         command = java_path + "\\win_amd64_jdk_21_jre\\bin\\java -jar qps.jar " + str(args)
 

{quarchpy-2.2.1.dev2.dist-info → quarchpy-2.2.1.dev3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: quarchpy
-Version: 2.2.1.dev2
+Version: 2.2.1.dev3
 Summary: This packpage offers Python support for Quarch Technology modules.
 Author: Quarch Technology ltd
 Author-email: support@quarch.com

{quarchpy-2.2.1.dev2.dist-info → quarchpy-2.2.1.dev3.dist-info}/RECORD

@@ -2,7 +2,7 @@ quarchpy/LICENSE.rst,sha256=SmYK6o5Xs2xRaUwYT-HqNDRu9eygu6y9QwweXNttiRc,3690
 quarchpy/QuarchPy Function Listing.xlsx,sha256=NE68cZPn7b9P3wcnCsnQr3H6yBkt6D5S6dH6457X520,31245
 quarchpy/README.txt,sha256=-LbrJ5rCPGSxoBmvr9CxJVokQUDwZSjoHa43eN8bWck,980
 quarchpy/__init__.py,sha256=0aEaJ1Aduzm1g_1OvibCDm5j2PcZAh-OPdVWiXZwF_E,3090
-quarchpy/_version.py,sha256=rF-iTUtktXgDO34m_OcVJUqqv6vOQ5P6OJ5zTnuwVKo,26
+quarchpy/_version.py,sha256=u48axF4vL83KpE5C0_Gr9zUa5g-EosUX20KOW9Ynrgg,26
 quarchpy/connection.py,sha256=9lPIUP4LCWkFAedc8CWorDY-3ujdAA-cyeNkSBdIv9E,2226
 quarchpy/run.py,sha256=N9Z1qwagWzbLKhqoXB7w_9hpcVNmHa4OxuZG0CaBjmQ,10084
 quarchpy/__pycache__/__init__.cpython-311.pyc,sha256=uNMpDUuvOcJMNW14xS77BgIqs55oZoFJGMsmwrm-NN0,5035
@@ -1373,12 +1373,12 @@ quarchpy/iometer/__pycache__/gen_iometer_template.cpython-311.pyc,sha256=EQ-gl4W
 quarchpy/iometer/__pycache__/iometerFuncs.cpython-311.pyc,sha256=l1KzV8XKzcmFEoQhzAz-uQUEvWtBMGj-a2ji5TkCURs,14056
 quarchpy/qis/StreamHeaderInfo.py,sha256=ynKRSnZPrRK6qtREbn4YQgweY-WWlP98-gl1YB1syh8,8150
 quarchpy/qis/__init__.py,sha256=QRVPy96G7RUx6ldofcD-xNN4NHeNjkasSu8DXkyRB0k,307
-quarchpy/qis/qisFuncs.py,sha256=TC19afKXZCSPgBlZVSRE9kuBIovd7TdZuC-6EYxSxYU,12801
+quarchpy/qis/qisFuncs.py,sha256=GoRCDLtUIpPZrnGyWzXCqWBRm60S6bcKeH39sCFfNy4,14297
 quarchpy/qis/__pycache__/StreamHeaderInfo.cpython-311.pyc,sha256=7fqpGGbuqOwJZFa_yoBjCGDPKfmFXHULY5kubtRI0TA,7543
 quarchpy/qis/__pycache__/__init__.cpython-311.pyc,sha256=nUP9QCKQFYpidwiR2a9vW2Mc1k82Xgtx58QXREtyi6s,530
 quarchpy/qis/__pycache__/qisFuncs.cpython-311.pyc,sha256=WdFMCoFC_tmb66660HGpqAF0t9cnguITOe4IlwtBFig,12327
 quarchpy/qps/__init__.py,sha256=5urxSvqUWmonIrhyvrSQDpNtZubfVEU8JrqRmzm4wH0,303
-quarchpy/qps/qpsFuncs.py,sha256=Y43eWdPLaMdOBp6HNWeoWDG5DWxGHUWd4PMKxXGEHTM,13521
+quarchpy/qps/qpsFuncs.py,sha256=I7r3prd7UmZczeeiqHCcqi4C9OElKz-ptP7FqZxvSOc,14770
 quarchpy/qps/__pycache__/__init__.cpython-311.pyc,sha256=_3EEMd3PYZpZeNPzCWwq_TxIbhNDrnub-YQsN6UDDCk,525
 quarchpy/qps/__pycache__/qpsFuncs.cpython-311.pyc,sha256=ZRFceTfLOLi_MNPryg_9nnXjETp9lpoMXvEn4sarUTw,13930
 quarchpy/user_interface/__init__.py,sha256=ix0icQvmKUTRgvfhXK3PxiDGyITkPYY-08hFjuhbupo,298
@@ -1394,7 +1394,7 @@ quarchpy/utilities/__pycache__/TestCenter.cpython-311.pyc,sha256=9yfX6igdHMrZUPv
 quarchpy/utilities/__pycache__/TimeValue.cpython-311.pyc,sha256=m1eIqBQqgClYACQJJcXkRrrwEMDliFiN6XL1T-gEwCE,2629
 quarchpy/utilities/__pycache__/Version.cpython-311.pyc,sha256=a_rUsCS3q0ojLrtZzUj3pkhSH2TY7QnhmRA_SZtlvzw,2658
 quarchpy/utilities/__pycache__/__init__.cpython-311.pyc,sha256=u7E62KfCC0zS7RWPWxHheZtKolDdRCu0jUSopYNBePI,173
-quarchpy-2.2.1.dev2.dist-info/METADATA,sha256=CQFWsvLd9JJ1GBys0nHdGufuHEViNebwJCxJkdDQi8U,9964
-quarchpy-2.2.1.dev2.dist-info/WHEEL,sha256=a-zpFRIJzOq5QfuhBzbhiA1eHTzNCJn8OdRvhdNX0Rk,110
-quarchpy-2.2.1.dev2.dist-info/top_level.txt,sha256=Vc7qsvkVax7oeBaBy_e7kvJvqb_VAAJcW_MuDMmi5W8,9
-quarchpy-2.2.1.dev2.dist-info/RECORD,,
+quarchpy-2.2.1.dev3.dist-info/METADATA,sha256=c0F3P4xaTUxPv_fdbVyZ5aZJcgbVjLtvJVh9BdHRfZs,9964
+quarchpy-2.2.1.dev3.dist-info/WHEEL,sha256=a-zpFRIJzOq5QfuhBzbhiA1eHTzNCJn8OdRvhdNX0Rk,110
+quarchpy-2.2.1.dev3.dist-info/top_level.txt,sha256=Vc7qsvkVax7oeBaBy_e7kvJvqb_VAAJcW_MuDMmi5W8,9
+quarchpy-2.2.1.dev3.dist-info/RECORD,,