quarchpy 2.2.17.dev1__py3-none-any.whl → 2.2.17.dev2__py3-none-any.whl

quarchpy/_version.py

@@ -1 +1 @@
-__version__ = "2.2.17.dev1"
+__version__ = "2.2.17.dev2"

quarchpy/qis/qisFuncs.py

@@ -8,6 +8,9 @@ import os, sys
 import time, platform
 from threading import Thread, Lock, Event, active_count
 from queue import Queue, Empty
+
+import quarchpy_binaries
+
 from quarchpy.connection_specific.connection_QIS import QisInterface
 from quarchpy.connection_specific.jdk_jres.fix_permissions import main as fix_permissions, find_java_permissions
 from quarchpy.install_qps import find_qps
@@ -95,9 +98,7 @@ def startLocalQis(terminal=False, headless=False, args=None, timeout=20):
         return
 
     # 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_jres")
+    java_path = quarchpy_binaries.get_jre_home()
     java_path = "\"" + java_path
 
     # change directory to /QPS/QIS
@@ -170,17 +171,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_jre\\bin\\" + command
+        command = java_path + "\\bin\\" + command
     elif current_os == "Linux" and current_arch == "x86_64":
-        command = java_path + "/lin_amd64_jdk_jre/bin/" + command
+        command = java_path + "/bin/" + command
     elif current_os == "Linux" and current_arch == "aarch64":
-        command = java_path + "/lin_arm64_jdk_jre/bin/" + command
+        command = java_path + "/bin/" + command
     elif current_os == "Darwin" and current_arch == "x86_64":
-        command = java_path + "/mac_amd64_jdk_jre/bin/" + command
+        command = java_path + "/bin/" + command
     elif current_os == "Darwin" and current_arch == "arm64":
-        command = java_path + "/mac_arm64_jdk_jre/bin/" + command
+        command = java_path + "/bin/" + command
     else:  # default to windows
-        command = java_path + "\\win_amd64_jdk_jre\\bin\\" + command
+        command = java_path + "\\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

@@ -2,6 +2,8 @@ from threading import Thread, Lock, Event
 from queue import Queue, Empty
 import platform
 
+import quarchpy_binaries
+
 from quarchpy.install_qps import find_qps
 from quarchpy.qis import isQisRunning, startLocalQis
 from quarchpy.connection_specific.connection_QPS import QpsInterface
@@ -91,9 +93,7 @@ def startLocalQps(keepQisRunning=False, args=[], timeout=30, startQPSMinimised=T
     current_dir = os.getcwd()
 
     # 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_jres")
+    java_path = quarchpy_binaries.get_jre_home()
     java_path = "\"" + java_path
     # Start to build the path towards qps.jar
     qps_path = os.path.dirname(os.path.abspath(__file__))
@@ -136,17 +136,17 @@ def startLocalQps(keepQisRunning=False, args=[], timeout=30, startQPSMinimised=T
 
     # OS dependency
     if current_os in "Windows":
-        command = java_path + "\\win_amd64_jdk_jre\\bin\\java\" -jar qps.jar " + str(args)
+        command = java_path + "\\bin\\java\" -jar qps.jar " + str(args)
     elif current_os in "Linux" and current_arch == "x86_64":
-        command = java_path + "/lin_amd64_jdk_jre/bin/java\" -jar qps.jar " + str(args)
+        command = java_path + "/bin/java\" -jar qps.jar " + str(args)
     elif current_os in "Linux" and current_arch == "aarch64":
-        command = java_path + "/lin_arm64_jdk_jre/bin/java\" -jar qps.jar " + str(args)
+        command = java_path + "/bin/java\" -jar qps.jar " + str(args)
     elif current_os in "Darwin" and current_arch == "x86_64":
-        command = java_path + "/mac_amd64_jdk_jre/bin/java\" -jar qps.jar " + str(args)
+        command = java_path + "/bin/java\" -jar qps.jar " + str(args)
     elif current_os in "Darwin" and current_arch == "arm64":
-        command = java_path + "/mac_arm64_jdk_jre/bin/java\" -jar qps.jar " + str(args)
+        command = java_path + "/bin/java\" -jar qps.jar " + str(args)
     else:  # default to windows
-        command = java_path + "\\win_amd64_jdk_jre\\bin\\java\" -jar qps.jar " + str(args)
+        command = java_path + "\\bin\\java\" -jar qps.jar " + str(args)
 
     if isQpsRunning():
         logger.debug("QPS is already running. Not starting another instance.")

{quarchpy-2.2.17.dev1.dist-info → quarchpy-2.2.17.dev2.dist-info}/METADATA

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

{quarchpy-2.2.17.dev1.dist-info → quarchpy-2.2.17.dev2.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=Tcy5E_CYPeI9gZIXo8HGFU8EEFAHy_iLLLGGvJY0LII,4827
-quarchpy/_version.py,sha256=i-RfpuGrAXJszBrC4L4an04vg6UPCvOfNKHkkcJKfnc,28
+quarchpy/_version.py,sha256=C7lcL4wEmssyY-yDgX28o5czgs4xOCFShHls1_F6jIs,28
 quarchpy/connection.py,sha256=9lPIUP4LCWkFAedc8CWorDY-3ujdAA-cyeNkSBdIv9E,2226
 quarchpy/install_qps.py,sha256=SA5apEma3MOAZUibgwZD7tzQZw8VExTIfBKIFpdhPK0,14276
 quarchpy/run.py,sha256=CXclGxRDuXzFKw7jNM0f_ooF-s7TaPxbubnYOYg2BRk,10550
@@ -747,9 +747,9 @@ quarchpy/iometer/gen_iometer_template.py,sha256=f0YM786dG4c1Bioq6zeclG83r8HBaffO
 quarchpy/iometer/iometerFuncs.py,sha256=qc0GK2SiCUHU_7mGL0z35MyNCdTcfSEf2wR1zti6KDY,14178
 quarchpy/qis/StreamHeaderInfo.py,sha256=InbVGRGrLCcIISZHb-IMmLu3gLx5RkAO1tUnEqM-pHM,8185
 quarchpy/qis/__init__.py,sha256=QRVPy96G7RUx6ldofcD-xNN4NHeNjkasSu8DXkyRB0k,307
-quarchpy/qis/qisFuncs.py,sha256=k-johC_92i7ilzl2fFU4XyItXtXnY0x7VujB5PLevqc,13433
+quarchpy/qis/qisFuncs.py,sha256=oVrGmGzfwv0xy4GV4jPPs44SqWd5ywA5of78WzSqQAk,13219
 quarchpy/qps/__init__.py,sha256=Kq5Ae1hy6c0nw26OwY1X31e72-wZ4C8RraTku6pvEfw,270
-quarchpy/qps/qpsFuncs.py,sha256=U8-wThMQxo6vkJ9v4BEBX-iqnqW69-fHvqUYMGRvp_I,12460
+quarchpy/qps/qpsFuncs.py,sha256=8a29CzMSi6AmJnHhPP2B4seYPnm2I-8yoVSu1i00nwc,12244
 quarchpy/user_interface/__init__.py,sha256=ix0icQvmKUTRgvfhXK3PxiDGyITkPYY-08hFjuhbupo,298
 quarchpy/user_interface/user_interface.py,sha256=NvN-9yL8jMn6DwY9KN1oQKXELDa3v3iVvqblsi9ZZVQ,29586
 quarchpy/utilities/BitManipulation.py,sha256=vLw2PF5z-d-2MY_yEU0l9FEBYTlCklM336XU2vPKAas,1016
@@ -757,7 +757,7 @@ quarchpy/utilities/TestCenter.py,sha256=5D63n-Wh1ADR5XSzxq1PAfynSEW-eN7fy9yMo3fI
 quarchpy/utilities/TimeValue.py,sha256=GJ5uxMkcnpRMFst5hoArZiPsUqLieLcKhMn_OdOmZwI,2192
 quarchpy/utilities/Version.py,sha256=i57qRgHwGSXf2wPVVNUZfG9Tu6f5hWxZLPy7XCw2WkQ,1578
 quarchpy/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-quarchpy-2.2.17.dev1.dist-info/METADATA,sha256=obLUxBIjpoSvvTTPODHsLCT927nrBEpKfuBJV_gNYd8,10982
-quarchpy-2.2.17.dev1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-quarchpy-2.2.17.dev1.dist-info/top_level.txt,sha256=Vc7qsvkVax7oeBaBy_e7kvJvqb_VAAJcW_MuDMmi5W8,9
-quarchpy-2.2.17.dev1.dist-info/RECORD,,
+quarchpy-2.2.17.dev2.dist-info/METADATA,sha256=uOp1z1MyIk2ZnF7sK5bXeYuJwA-3xsplwH_GOu566Rk,10982
+quarchpy-2.2.17.dev2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+quarchpy-2.2.17.dev2.dist-info/top_level.txt,sha256=Vc7qsvkVax7oeBaBy_e7kvJvqb_VAAJcW_MuDMmi5W8,9
+quarchpy-2.2.17.dev2.dist-info/RECORD,,