DIRAC 9.0.2__tar.gz → 9.0.5__tar.gz

{dirac-9.0.2/src/DIRAC.egg-info → dirac-9.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DIRAC
-Version: 9.0.2
+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,9 +19,10 @@ Requires-Dist: cachetools
 Requires-Dist: certifi
 Requires-Dist: cwltool
 Requires-Dist: diraccfg
-Requires-Dist: DIRACCommon==v9.0.2
-Requires-Dist: diracx-client>=v0.0.1a18
-Requires-Dist: diracx-core>=v0.0.1a18
+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
 Requires-Dist: db12
 Requires-Dist: fts3
 Requires-Dist: gfal2-python

{dirac-9.0.2 → dirac-9.0.5}/dirac.cfg

@@ -219,7 +219,7 @@ Registry
       IdPRole = some_special_scope
 
       # Virtual organization associated with the group
-      VOMSVO = lhcb
+      VO = lhcb
 
       # Just for normal users:
       JobShare = 200

{dirac-9.0.2 → dirac-9.0.5}/release.notes

@@ -1,3 +1,21 @@
+[v9.0.5]
+
+*Subsystem
+
+CHANGE: (#8353) add PreferredURLPatterns to pilot.json
+
+[v9.0.4]
+[v9.0.3]
+
+*DiracX
+
+NEW: (#8347) Depend on released versions of DiracX
+NEW: (#8347) Depend on diracx-cli to ease management of DiracX CS conversion
+
+*FrameworkSystem
+
+CHANGE: (#8324) Remove Registry/group option VOMSVO (simply use "VO")
+
 [v9.0.2]
 
 *MonitoringSystem

{dirac-9.0.2 → dirac-9.0.5}/setup.cfg

@@ -26,9 +26,10 @@ install_requires =
 	certifi
 	cwltool
 	diraccfg
-	DIRACCommon==v9.0.2
-	diracx-client >=v0.0.1a18
-	diracx-core >=v0.0.1a18
+	DIRACCommon==v9.0.5
+	diracx-client >=v0.0.1
+	diracx-core >=v0.0.1
+	diracx-cli >=v0.0.1
 	db12
 	fts3
 	gfal2-python

{dirac-9.0.2 → dirac-9.0.5}/src/DIRAC/ConfigurationSystem/Client/Helpers/Registry.py

@@ -3,18 +3,14 @@
 import errno
 import inspect
 import sys
-
-from threading import Lock
 from collections.abc import Iterable
+from threading import Lock
+from typing import Optional
 
 from cachetools import TTLCache, cached
 from cachetools.keys import hashkey
 
-
-from typing import Optional
-from collections.abc import Iterable
-
-from DIRAC import S_OK, S_ERROR
+from DIRAC import S_ERROR, S_OK
 from DIRAC.ConfigurationSystem.Client.Config import gConfig
 from DIRAC.ConfigurationSystem.Client.Helpers.CSGlobals import getVO
 
@@ -488,28 +484,6 @@ def getVOMSAttributeForGroup(group):
     return gConfig.getValue(f"{gBaseRegistrySection}/Groups/{group}/VOMSRole", getDefaultVOMSAttribute())
 
 
-def getDefaultVOMSVO():
-    """Get default VOMS VO
-
-    :return: str
-    """
-    return gConfig.getValue(f"{gBaseRegistrySection}/DefaultVOMSVO", "") or getVO()
-
-
-def getVOMSVOForGroup(group):
-    """Search VOMS VO for group
-
-    :param str group: group name
-
-    :return: str
-    """
-    vomsVO = gConfig.getValue(f"{gBaseRegistrySection}/Groups/{group}/VOMSVO", getDefaultVOMSVO())
-    if not vomsVO:
-        vo = getVOForGroup(group)
-        vomsVO = getVOOption(vo, "VOMSName", "")
-    return vomsVO
-
-
 def getGroupsWithVOMSAttribute(vomsAttr):
     """Search groups with VOMS attribute
 

{dirac-9.0.2 → dirac-9.0.5}/src/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-9.0.2 → dirac-9.0.5}/src/DIRAC/FrameworkSystem/DB/ProxyDB.py

@@ -601,13 +601,13 @@ class ProxyDB(DB):
         :return: S_OK(dict)/S_ERROR() -- dict contain attribute and VOMS VO
         """
         if requiredVOMSAttribute:
-            return S_OK({"attribute": requiredVOMSAttribute, "VOMSVO": Registry.getVOMSVOForGroup(userGroup)})
+            return S_OK({"attribute": requiredVOMSAttribute, "VO": Registry.getVOForGroup(userGroup)})
 
         csVOMSMapping = Registry.getVOMSAttributeForGroup(userGroup)
         if not csVOMSMapping:
             return S_ERROR(f"No mapping defined for group {userGroup} in the CS")
 
-        return S_OK({"attribute": csVOMSMapping, "VOMSVO": Registry.getVOMSVOForGroup(userGroup)})
+        return S_OK({"attribute": csVOMSMapping, "VO": Registry.getVOForGroup(userGroup)})
 
     def getVOMSProxy(self, userDN, userGroup, requiredLifeTime=None, requestedVOMSAttr=None):
         """Get proxy string from the Proxy Repository for use with userDN
@@ -624,7 +624,7 @@ class ProxyDB(DB):
         if not retVal["OK"]:
             return retVal
         vomsAttr = retVal["Value"]["attribute"]
-        vomsVO = retVal["Value"]["VOMSVO"]
+        vomsVO = retVal["Value"]["VO"]
 
         # Look in the cache
         retVal = self.__getPemAndTimeLeft(userDN, userGroup, vomsAttr)

{dirac-9.0.2 → dirac-9.0.5}/src/DIRAC/FrameworkSystem/scripts/dirac_login.py

@@ -38,8 +38,8 @@ Script.disableCS()
 from DIRAC.ConfigurationSystem.Client.Helpers.Registry import (
     findDefaultGroupForDN,
     getGroupOption,
+    getVOForGroup,
     getVOMSAttributeForGroup,
-    getVOMSVOForGroup,
 )
 from DIRAC.FrameworkSystem.Client.ProxyManagerClient import gProxyManager
 from DIRAC.FrameworkSystem.private.authorization.utils.Tokens import (
@@ -285,7 +285,7 @@ class Params:
                 if not (vomsAttr := getVOMSAttributeForGroup(self.group)):
                     print(HTML(f"<yellow>No VOMS attribute foud for {self.group}</yellow>"))
                 else:
-                    vo = getVOMSVOForGroup(self.group)
+                    vo = getVOForGroup(self.group)
                     if not (result := VOMS().setVOMSAttributes(self.outputFile, attribute=vomsAttr, vo=vo))["OK"]:
                         return S_ERROR(f"Failed adding VOMS attribute: {result['Message']}")
                     chain = result["Value"]

{dirac-9.0.2 → dirac-9.0.5}/src/DIRAC/FrameworkSystem/scripts/dirac_proxy_init.py

@@ -96,7 +96,7 @@ class ProxyInit:
             )
 
         resultVomsAttributes = VOMS.VOMS().setVOMSAttributes(
-            self.__proxyGenerated, attribute=vomsAttr, vo=Registry.getVOMSVOForGroup(self.__piParams.diracGroup)
+            self.__proxyGenerated, attribute=vomsAttr, vo=Registry.getVOForGroup(self.__piParams.diracGroup)
         )
         if not resultVomsAttributes["OK"]:
             return S_ERROR(

{dirac-9.0.2 → dirac-9.0.5}/src/DIRAC/TransformationSystem/Utilities/ReplicationCLIParameters.py

@@ -1,10 +1,10 @@
 """
 Command Line Parameters for creating the Replication transformations Script
 """
-from DIRAC import S_OK, S_ERROR, gLogger
+from DIRAC import S_ERROR, S_OK, gLogger
+from DIRAC.ConfigurationSystem.Client.Helpers.Registry import getVOForGroup
 from DIRAC.Core.Security.Properties import SecurityProperty
 from DIRAC.Core.Security.ProxyInfo import getProxyInfo
-from DIRAC.ConfigurationSystem.Client.Helpers.Registry import getVOMSVOForGroup
 
 
 class Params:
@@ -144,7 +144,7 @@ class Params:
             return False
         proxyValues = proxyInfo.get("Value", {})
         group = proxyValues.get("group", "")
-        vomsvo = getVOMSVOForGroup(group)
+        vomsvo = getVOForGroup(group)
         if not vomsvo:
             self.errorMessages.append("ERROR: ProxyGroup not associated to VOMS VO, get a different proxy")
             return False

{dirac-9.0.2 → dirac-9.0.5}/src/DIRAC/TransformationSystem/test/Test_replicationTransformation.py

@@ -1,14 +1,13 @@
 """Test the dirac-transformation-replication script and helper"""
 import unittest
+from unittest.mock import MagicMock as Mock
+from unittest.mock import patch
 
-from unittest.mock import MagicMock as Mock, patch
-
-from DIRAC import S_OK, S_ERROR
-
-from DIRAC.TransformationSystem.Utilities.ReplicationTransformation import createDataTransformation
+from DIRAC import S_ERROR, S_OK
 from DIRAC.TransformationSystem.Utilities.ReplicationCLIParameters import Params
+from DIRAC.TransformationSystem.Utilities.ReplicationTransformation import createDataTransformation
 
-GET_VOMS = "DIRAC.TransformationSystem.Utilities.ReplicationCLIParameters.getVOMSVOForGroup"
+GET_VOMS = "DIRAC.TransformationSystem.Utilities.ReplicationCLIParameters.getVOForGroup"
 GET_PROXY = "DIRAC.TransformationSystem.Utilities.ReplicationCLIParameters.getProxyInfo"
 
 

{dirac-9.0.2 → dirac-9.0.5}/src/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.2 → dirac-9.0.5/src/DIRAC.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DIRAC
-Version: 9.0.2
+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,9 +19,10 @@ Requires-Dist: cachetools
 Requires-Dist: certifi
 Requires-Dist: cwltool
 Requires-Dist: diraccfg
-Requires-Dist: DIRACCommon==v9.0.2
-Requires-Dist: diracx-client>=v0.0.1a18
-Requires-Dist: diracx-core>=v0.0.1a18
+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
 Requires-Dist: db12
 Requires-Dist: fts3
 Requires-Dist: gfal2-python

{dirac-9.0.2 → dirac-9.0.5}/src/DIRAC.egg-info/requires.txt

@@ -4,9 +4,10 @@ cachetools
 certifi
 cwltool
 diraccfg
-DIRACCommon==v9.0.2
-diracx-client>=v0.0.1a18
-diracx-core>=v0.0.1a18
+DIRACCommon==v9.0.5
+diracx-client>=v0.0.1
+diracx-core>=v0.0.1
+diracx-cli>=v0.0.1
 db12
 fts3
 gfal2-python