quarchpy 2.2.0.dev1__py2.py3-none-any.whl → 2.2.1__py2.py3-none-any.whl

quarchpy/debug/SystemTest.py

@@ -200,7 +200,7 @@ def main (args=None):
 
 
 if __name__ == "__main__":
-    find_java_permissions()
-    #    main([])
+    main([])
+    #find_java_permissions()
     #main(["--skipSystemInfo","--skipCommsTest"])
     #main(["--fixusb"])

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")
 
@@ -138,13 +150,15 @@ def startLocalQis(terminal=False, headless=False, args=None, timeout=20):
 
     # Building the command
 
+
     # prefer IPV4 to IPV6
     ipv4v6_vm_args = "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
 
     # Process command prefix. Needed for headless mode, to support OSs with no system tray.
-    cmd_prefix = ""
+    cmd_prefix =ipv4v6_vm_args
     if headless is True or (args is not None and "-headless" in args):
-        cmd_prefix = "-Djava.awt.headless=true"
+        cmd_prefix += " -Djava.awt.headless=true"
+
 
     # Process command suffix (additional standard options for QIS).
     if terminal is True:
@@ -163,21 +177,31 @@ def startLocalQis(terminal=False, headless=False, args=None, timeout=20):
     # record current working directory
     current_dir = os.getcwd()
 
-    command = "java " + ipv4v6_vm_args + cmd_prefix + " -jar qis.jar" + cmd_suffix
+
+    command = "java " + cmd_prefix + " -jar qis.jar" + cmd_suffix
     
     # 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,15 +143,24 @@ 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)
 
     if "-logging=ON" in str(args): #If logging to a terminal window is on then os.system should be used to keep a window open to view logging.
-        process = subprocess.Popen(command,shell=True)
+        if current_os in "Windows":
+            process = subprocess.Popen(command,shell=True)
+        else:
+            # Add a hold command to keep the terminal open (useful for bash)
+            command_with_pause = command + "; exec bash"
+            process = subprocess.run(command_with_pause, shell=True)
     else:
         if sys.version_info[0] < 3:
             process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)

{quarchpy-2.2.0.dev1.dist-info → quarchpy-2.2.1.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: quarchpy
-Version: 2.2.0.dev1
-Summary: This package offers Python support for Quarch Technology modules.
+Version: 2.2.1
+Summary: This packpage offers Python support for Quarch Technology modules.
 Author: Quarch Technology ltd
 Author-email: support@quarch.com
 License: Quarch Technology ltd