quarchpy 2.2.9.dev5__py2.py3-none-any.whl → 2.2.10__py2.py3-none-any.whl

quarchpy/qis/qisFuncs.py

@@ -9,7 +9,7 @@ import time, platform
 from threading import Thread, Lock, Event, active_count
 from queue import Queue, Empty
 from quarchpy.connection_specific.connection_QIS import QisInterface
-from quarchpy.connection_specific.jdk_j21_jres.fix_permissions import main as fix_permissions, find_java_permissions
+from quarchpy.connection_specific.jdk_jres.fix_permissions import main as fix_permissions, find_java_permissions
 from quarchpy.user_interface.user_interface import printText, logDebug
 import subprocess
 import logging
@@ -92,7 +92,7 @@ def startLocalQis(terminal=False, headless=False, args=None, timeout=20):
     # java path
     java_path = os.path.dirname(os.path.abspath(__file__))
     java_path, junk = os.path.split(java_path)
-    java_path = os.path.join(java_path, "connection_specific", "jdk_j21_jres")
+    java_path = os.path.join(java_path, "connection_specific", "jdk_jres")
     java_path = "\"" + java_path
 
     # change directory to /QPS/QIS
@@ -157,10 +157,14 @@ def startLocalQis(terminal=False, headless=False, args=None, timeout=20):
     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 = ipv4v6_vm_args
+    # Added the flag to suppress the Java restricted method warning
+    cmd_prefix = ipv4v6_vm_args + " --enable-native-access=ALL-UNNAMED"
     if headless is True or (args is not None and "-headless" in args):
         cmd_prefix += " -Djava.awt.headless=true"
 
+    # Ignore netty unsafe warning
+    cmd_prefix += " -Dio.netty.noUnsafe=true"
+
     # Process command suffix (additional standard options for QIS).
     if terminal is True:
         cmd_suffix = " -terminal"
@@ -180,17 +184,17 @@ 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
+        command = java_path + "\\win_amd64_jdk_jre\\bin\\" + command
     elif current_os == "Linux" and current_arch == "x86_64":
-        command = java_path + "/lin_amd64_jdk_21_jre/bin/" + command
+        command = java_path + "/lin_amd64_jdk_jre/bin/" + command
     elif current_os == "Linux" and current_arch == "aarch64":
-        command = java_path + "/lin_arm64_jdk_21_jre/bin/" + command
+        command = java_path + "/lin_arm64_jdk_jre/bin/" + command
     elif current_os == "Darwin" and current_arch == "x86_64":
-        command = java_path + "/mac_amd64_jdk_21_jre/bin/" + command
+        command = java_path + "/mac_amd64_jdk_jre/bin/" + command
     elif current_os == "Darwin" and current_arch == "arm64":
-        command = java_path + "/mac_arm64_jdk_21_jre/bin/" + command
+        command = java_path + "/mac_arm64_jdk_jre/bin/" + command
     else:  # default to windows
-        command = java_path + "\\win_amd64_jdk_21_jre\\bin\\" + command
+        command = java_path + "\\win_amd64_jdk_jre\\bin\\" + command
 
     # Use the command and check QIS has launched
     # If logging to a terminal window is on then os.system should be used to view logging.

quarchpy/qps/qpsFuncs.py

@@ -3,7 +3,7 @@ from queue import Queue, Empty
 import platform
 from quarchpy.qis import isQisRunning, startLocalQis
 from quarchpy.connection_specific.connection_QPS import QpsInterface
-from quarchpy.connection_specific.jdk_j21_jres.fix_permissions import main as fix_permissions, find_java_permissions
+from quarchpy.connection_specific.jdk_jres.fix_permissions import main as fix_permissions, find_java_permissions
 from quarchpy.user_interface import *
 import subprocess
 import logging
@@ -79,10 +79,10 @@ def startLocalQps(keepQisRunning=False, args=[], timeout=30, startQPSMinimised=T
     # Record current working directory
     current_dir = os.getcwd()
 
-    # JRE 21 path
+    # JRE path
     java_path = os.path.dirname(os.path.abspath(__file__))
     java_path, junk = os.path.split(java_path)
-    java_path = os.path.join(java_path, "connection_specific", "jdk_j21_jres")
+    java_path = os.path.join(java_path, "connection_specific", "jdk_jres")
     java_path = "\"" + java_path
     # Start to build the path towards qps.jar
     qps_path = os.path.dirname(os.path.abspath(__file__))
@@ -103,7 +103,7 @@ def startLocalQps(keepQisRunning=False, args=[], timeout=30, startQPSMinimised=T
     permissions, message = find_java_permissions()
     if permissions is False:
         logging.warning(message)
-        logging.warning("Not having correct permissions will prevent Quarch Java 21 Programs from launching.")
+        logging.warning("Not having correct permissions will prevent Quarch Java Programs from launching.")
         logging.warning("Run \"python -m quarchpy.run permission_fix\" to fix this.")
         user_input = input("Would you like to use auto run this now? (Y/N)")
         if user_input.lower() == "y":
@@ -139,17 +139,17 @@ 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)
+        command = java_path + "\\win_amd64_jdk_jre\\bin\\java\" -jar qps.jar " + str(args)
     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)
+        command = java_path + "/lin_amd64_jdk_jre/bin/java\" -jar qps.jar " + str(args)
     elif current_os in "Linux" and current_arch == "aarch64":
-        command = java_path + "/lin_arm64_jdk_21_jre/bin/java\" -jar qps.jar " + str(args)
+        command = java_path + "/lin_arm64_jdk_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)
+        command = java_path + "/mac_amd64_jdk_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)
+        command = java_path + "/mac_arm64_jdk_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)
+        command = java_path + "\\win_amd64_jdk_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.
         if current_os in "Windows":

quarchpy/utilities/TestCenter.py

@@ -5,11 +5,12 @@ This is Quarch internal use only.  Each function uses the stdin/stdout to commun
 as such, communication is based on simple strings
 """
 
-#import testCenter
+# import testCenter
 from inspect import getframeinfo, stack
 import sys
 
-def setup (interface_name, *command_params, stack_level=1):
+
+def setup(interface_name, *command_params, stack_level=1):
     """
     Sets up a test interface, passing the interface parameters onto TestCenter to process
     
@@ -23,29 +24,30 @@ def setup (interface_name, *command_params, stack_level=1):
     Returns
     -------
     setup_response : str
-        String returned from setup function. Generally "1" or "0" as a boolean success flag    
+        String returned from setup function. Generally "1" or "0" as a boolean success flag
+
+    """
 
-    """    
-    
     # Get stack info so we can track the calling function for reporting and debug
     caller = getframeinfo(stack()[stack_level][0])
 
     # Write the command and params to STDOUT
-    sys.stdout.write ("SETUP," + str(caller.filename) + "," + str(caller.lineno) + "," + interface_name + ",")
+    sys.stdout.write("SETUP," + str(caller.filename) + "," + str(caller.lineno) + "," + interface_name + ",")
     for index, item in enumerate(command_params):
-        if (index < len(command_params)-1):
-            sys.stdout.write ("\"" + item + "\"" + ",")
+        if index < len(command_params) - 1:
+            sys.stdout.write("\"" + item + "\"" + ",")
         else:
-            sys.stdout.write ("\"" + item)
+            sys.stdout.write("\"" + item)
 
-    sys.stdout.write ("\n")
+    sys.stdout.write("\n")
     sys.stdout.flush()
 
     # Read the response from STDIN as the function result
-    return sys.stdin.readline().strip();
-	
+    return sys.stdin.readline().strip()
+
+
 # Runs an interface setup function
-def testPoint (command_name, *command_params, stack_level=1):
+def testPoint(command_name, *command_params, stack_level=1):
     """
     Runs a test point from the testcenter library functions
     
@@ -61,39 +63,37 @@ def testPoint (command_name, *command_params, stack_level=1):
     test_response : str
         String returned from test function. This varies based on the TestPoint spec    
 
-    """  
+    """
 
     caller = getframeinfo(stack()[stack_level][0])
 
-
     # Write the command and params to STDOUT
-    sys.stdout.write ("TEST," + str(caller.filename) + "," + str(caller.lineno) + "," + command_name + ",")
+    sys.stdout.write("TEST," + str(caller.filename) + "," + str(caller.lineno) + "," + command_name + ",")
     for x in command_params:
-        sys.stdout.write ("\"" + x + "\"" + ",")
+        sys.stdout.write("\"" + x + "\"" + ",")
 
-    sys.stdout.write ("\n")
+    sys.stdout.write("\n")
     sys.stdout.flush()
 
     # Read the response from STDIN as the test response
-    return sys.stdin.readline().strip();
-	
+    return sys.stdin.readline().strip()
+
 
 def endTest(stack_level=1):
     """
     Orders the end of the test.  This will terminate the test parser and disponse of any resources
     held by the test libraries (including quarch module connections)      
 
-    """  
+    """
 
     caller = getframeinfo(stack()[stack_level][0])
 
-    sys.stdout.write ("ENDTEST," + str(caller.filename) + "," + str(caller.lineno));
-    sys.stdout.write ("\n");
+    sys.stdout.write("ENDTEST," + str(caller.filename) + "," + str(caller.lineno))
+    sys.stdout.write("\n")
     sys.stdout.flush()
-	
-    
 
-def beginTestBlock (message_text, stack_level=1):
+
+def beginTestBlock(message_text, stack_level=1):
     """
     Notes the start of a block of tests.  This allows multiple nested layers of related tests
     to improve readability of the results.  This has no effect on the test execution, only
@@ -109,21 +109,21 @@ def beginTestBlock (message_text, stack_level=1):
     test_response : str
         String returned from test function. This will be "1" on success and "0" on error     
             
-    """  
+    """
 
     caller = getframeinfo(stack()[stack_level][0])
 
     # Write the command and params to STDOUT
-    sys.stdout.write ("BLOCK_START," + str(caller.filename) + "," + str(caller.lineno) + "," + "\"" + message_text + "\"")
-    sys.stdout.write ("\n")
+    sys.stdout.write(
+        "BLOCK_START," + str(caller.filename) + "," + str(caller.lineno) + "," + "\"" + message_text + "\"")
+    sys.stdout.write("\n")
     sys.stdout.flush()
 
     # Read the response from STDIN
     return sys.stdin.readline().strip()
-	
 
 
-def endTestBlock (stack_level=1):
+def endTestBlock(stack_level=1):
     """
     Notes the end of a block of tests.  This allows multiple nested layers of related tests
     to improve readability of the results.  This has no effect on the test execution, only
@@ -134,14 +134,38 @@ def endTestBlock (stack_level=1):
     test_response : str
         String returned from test function. This will be "1" on success and "0" on error      
             
-    """  
+    """
 
     caller = getframeinfo(stack()[stack_level][0])
 
     # Write the command and params to STDOUT
-    sys.stdout.write ("BLOCK_END," + str(caller.filename) + "," + str(caller.lineno) + "," + "\"")
-    sys.stdout.write ("\n")
+    sys.stdout.write("BLOCK_END," + str(caller.filename) + "," + str(caller.lineno) + "," + "\"")
+    sys.stdout.write("\n")
     sys.stdout.flush()
 
     # Read the response from STDIN
     return sys.stdin.readline().strip()
+
+
+def GetVariable(package: str, var_name: str) -> str:
+    """
+    Access a TestCenter user variable and return its value.
+
+    Args:
+        package: Name of the TestCenter package to access. UNUSED
+        var_name: Name of the string variable to return.
+
+    Returns:
+        The text of the stored variable.
+    """
+
+    # Get caller file and line number
+    caller = getframeinfo(stack()[stack_level][0])
+
+    # Write the command and params to STDOUT
+    print(f"GET_VARIABLE,{str(caller.filename)},{str(caller.lineno)},{var_name}")
+
+    # Read the response from STDIN
+    response = sys.stdin.readline().strip()
+
+    return response