DIRAC 9.0.4__py3-none-any.whl → 9.0.5__py3-none-any.whl

DIRAC/Core/scripts/dirac_apptainer_exec.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
-""" Starts a DIRAC command inside an apptainer container.
-"""
+"""Starts a DIRAC command inside an apptainer container."""
 
 import os
 import sys
@@ -52,8 +51,9 @@ def main():
         if switch[0].lower() == "i" or switch[0].lower() == "image":
             user_image = switch[1]
 
-    dirac_env_var = os.environ.get("DIRAC", os.getcwd())
-    diracos_env_var = os.environ.get("DIRACOS", os.getcwd())
+    cwd = os.path.realpath(os.getcwd())
+    dirac_env_var = os.environ.get("DIRAC", cwd)
+    diracos_env_var = os.environ.get("DIRACOS", cwd)
     etc_dir = os.path.join(DIRAC.rootPath, "etc")
     rc_script = os.path.join(os.path.realpath(sys.base_prefix), "diracosrc")
 
@@ -74,7 +74,7 @@ def main():
     cmd.extend(["--contain"])  # use minimal /dev and empty other directories (e.g. /tmp and $HOME)
     cmd.extend(["--ipc"])  # run container in a new IPC namespace
     cmd.extend(["--pid"])  # run container in a new PID namespace
-    cmd.extend(["--bind", f"{os.getcwd()}"])  # bind current directory for dirac_container.sh
+    cmd.extend(["--bind", cwd])  # bind current directory for dirac_container.sh
     if proxy_location:
         cmd.extend(["--bind", f"{proxy_location}:/etc/proxy"])  # bind proxy file
     cmd.extend(["--bind", f"{getCAsLocation()}:/etc/grid-security/certificates"])  # X509_CERT_DIR
@@ -89,13 +89,13 @@ def main():
         if safe_listdir(bind_path):
             cmd.extend(["--bind", f"{bind_path}:{bind_path}"])
         else:
-            gLogger.warning(f"Bind path {bind_path} does not exist, skipping")
-    cmd.extend(["--cwd", f"{os.getcwd()}"])  # set working directory
+            gLogger.warn(f"Bind path {bind_path} does not exist, skipping")
+    cmd.extend(["--cwd", cwd])  # set working directory
 
     rootImage = user_image or gConfig.getValue("/Resources/Computing/Singularity/ContainerRoot") or CONTAINER_DEFROOT
 
     if os.path.isdir(rootImage) or os.path.isfile(rootImage):
-        cmd.extend([rootImage, f"{os.getcwd()}/dirac_container.sh"])
+        cmd.extend([rootImage, f"{cwd}/dirac_container.sh"])
     else:
         # if we are here is because there's no image, or it is not accessible (e.g. not on CVMFS)
         gLogger.error("Apptainer image to exec not found: ", rootImage)

DIRAC/WorkloadManagementSystem/Utilities/PilotCStoJSONSynchronizer.py

@@ -11,7 +11,6 @@ import os
 import shutil
 import tarfile
 from typing import Any
-
 from git import Repo
 
 from DIRAC import S_OK, gConfig, gLogger
@@ -217,6 +216,10 @@ class PilotCStoJSONSynchronizer:
 
         pilotDict["ConfigurationServers"] = configurationServers
 
+        preferredURLPatterns = gConfigurationData.extractOptionFromCFG("/DIRAC/PreferredURLPatterns")
+        if preferredURLPatterns:
+            pilotDict["PreferredURLPatterns"] = preferredURLPatterns
+
         self.log.debug("Got pilotDict", str(pilotDict))
 
         return S_OK(pilotDict)

{dirac-9.0.4.dist-info → dirac-9.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DIRAC
-Version: 9.0.4
+Version: 9.0.5
 Summary: DIRAC is an interware, meaning a software framework for distributed computing.
 Home-page: https://github.com/DIRACGrid/DIRAC/
 License: GPL-3.0-only
@@ -19,7 +19,7 @@ Requires-Dist: cachetools
 Requires-Dist: certifi
 Requires-Dist: cwltool
 Requires-Dist: diraccfg
-Requires-Dist: DIRACCommon==v9.0.4
+Requires-Dist: DIRACCommon==v9.0.5
 Requires-Dist: diracx-client>=v0.0.1
 Requires-Dist: diracx-core>=v0.0.1
 Requires-Dist: diracx-cli>=v0.0.1

{dirac-9.0.4.dist-info → dirac-9.0.5.dist-info}/RECORD

@@ -322,7 +322,7 @@ DIRAC/Core/Workflow/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 DIRAC/Core/Workflow/test/step_g.py,sha256=hlncZ_tbb74wz0mRxyHTl0NnjRut2ysWLgUfiTvi9yo,21830
 DIRAC/Core/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 DIRAC/Core/scripts/dirac_agent.py,sha256=cjR5wuh4j5D5nTvu9ZfPbjdbZiEnRG34GJj7iSh47qk,1670
-DIRAC/Core/scripts/dirac_apptainer_exec.py,sha256=6zs6PepCtLj96OoDDxpRUQk9nKgs9ksAG8o6J6djbFo,4666
+DIRAC/Core/scripts/dirac_apptainer_exec.py,sha256=fIg4DDJJ9TwbsCNbQpkkUOIvpetGnqlKWF75Gi3RhQ8,4651
 DIRAC/Core/scripts/dirac_cert_convert.py,sha256=3ThPmb1Tg-UgeH-3ZV0ilkZ8-H4RsK8SOszLuuYG-vs,2498
 DIRAC/Core/scripts/dirac_configure.py,sha256=c3ZfQUe_JUJASi3iuvl4qD83kyfWvS_QixISyG833sg,29494
 DIRAC/Core/scripts/dirac_executor.py,sha256=ZZnr8NjjBmmKmQhUnstRklw9HTsP75XRXnkBawDWdnE,1722
@@ -1241,7 +1241,7 @@ DIRAC/WorkloadManagementSystem/Utilities/JobModel.py,sha256=jN9sFbzMZo9tab6Kp7Oe
 DIRAC/WorkloadManagementSystem/Utilities/JobParameters.py,sha256=JW3AAEtBJn1gIO_rm2Ft5qqjfLteIo3HpQtGNZBfhxE,8365
 DIRAC/WorkloadManagementSystem/Utilities/JobStatusUtility.py,sha256=WtGJzC7fHvydANh8JH6e1Kk_jebrCMPr2c5cw3ufjm8,7826
 DIRAC/WorkloadManagementSystem/Utilities/ParametricJob.py,sha256=FNUsGhvsFVrtmA7r8G-sd4QTMeBkqG1sdtwiBUKQyd0,605
-DIRAC/WorkloadManagementSystem/Utilities/PilotCStoJSONSynchronizer.py,sha256=sjOOWeKLZMpYD2GJVU-EOkZAfmRpAwIcJntAAcalE20,12244
+DIRAC/WorkloadManagementSystem/Utilities/PilotCStoJSONSynchronizer.py,sha256=Ezpfd90dV_j6fOn25v5gr-wNWh1nMpCOQZfPmGDHJD4,12448
 DIRAC/WorkloadManagementSystem/Utilities/PilotWrapper.py,sha256=VcvQTpeyTbVYqSsPQDyAt37N2CaEAnIuvbR6yk4kYk8,15465
 DIRAC/WorkloadManagementSystem/Utilities/QueueUtilities.py,sha256=J5-n_lvWbW_TRjrlqp8hx1SHEaXDW2Dxp3R1hBBrWnE,12082
 DIRAC/WorkloadManagementSystem/Utilities/RemoteRunner.py,sha256=7FcEtlYSJMzdbLIFBUKD-j_wqRHya-ISqk8w-JRy3kw,12159
@@ -1295,9 +1295,9 @@ DIRAC/tests/Workflow/Integration/exe-script.py,sha256=B_slYdTocEzqfQLRhwuPiLyYUn
 DIRAC/tests/Workflow/Integration/helloWorld.py,sha256=tBgEHH3ZF7ZiTS57gtmm3DW-Qxgm_57HWHpM-Y8XSws,205
 DIRAC/tests/Workflow/Regression/helloWorld.py,sha256=69eCgFuVSYo-mK3Dj2dw1c6g86sF5FksKCf8V2aGVoM,509
 DIRAC/tests/Workflow/Regression/helloWorld.xml,sha256=xwydIcFTAHIX-YPfQfyxuQ7hzvIO3IhR3UAF7ORgkGg,5310
-dirac-9.0.4.dist-info/licenses/LICENSE,sha256=uyr4oV6jmjUeepXZPPjkJRwa5q5MrI7jqJz5sVXNblQ,32452
-dirac-9.0.4.dist-info/METADATA,sha256=ofzrBlYA8y8DfE4XMr1GauK7TQ0jpEO5FYZzswXwCSE,10016
-dirac-9.0.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dirac-9.0.4.dist-info/entry_points.txt,sha256=hupzIL8aVmjK3nn7RLKdhcaiPmLOiD3Kulh3CSDHKmw,16492
-dirac-9.0.4.dist-info/top_level.txt,sha256=RISrnN9kb_mPqmVu8_o4jF-DSX8-h6AcgfkO9cgfkHA,6
-dirac-9.0.4.dist-info/RECORD,,
+dirac-9.0.5.dist-info/licenses/LICENSE,sha256=uyr4oV6jmjUeepXZPPjkJRwa5q5MrI7jqJz5sVXNblQ,32452
+dirac-9.0.5.dist-info/METADATA,sha256=WgBoEsoG3B1PTa2YPy4NsEzaG4q01d5BOVhMYEIZbTs,10016
+dirac-9.0.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dirac-9.0.5.dist-info/entry_points.txt,sha256=hupzIL8aVmjK3nn7RLKdhcaiPmLOiD3Kulh3CSDHKmw,16492
+dirac-9.0.5.dist-info/top_level.txt,sha256=RISrnN9kb_mPqmVu8_o4jF-DSX8-h6AcgfkO9cgfkHA,6
+dirac-9.0.5.dist-info/RECORD,,