DIRAC 9.0.0a42__py3-none-any.whl → 9.0.7__py3-none-any.whl

DIRAC/WorkloadManagementSystem/Utilities/test/Test_ParametricJob.py

@@ -1,138 +1,55 @@
-""" This is a test of the parametric job generation tools
-"""
+""" This is a test of the parametric job generation tools"""
 # pylint: disable= missing-docstring
 
 import pytest
 
+# Test imports from DIRAC to verify backward compatibility
 from DIRAC.WorkloadManagementSystem.Utilities.ParametricJob import generateParametricJobs, getParameterVectorLength
 from DIRAC.Core.Utilities.ClassAd.ClassAdLight import ClassAd
 
-TEST_JDL_NO_PARAMETERS = """
-[
-    Executable = "my_executable";
-    Arguments = "%s";
-    JobName = "Test_%n";
-]
-"""
 
-TEST_JDL_SIMPLE = """
-[
-    Executable = "my_executable";
-    Arguments = "%s";
-    JobName = "Test_%n";
-    Parameters = { "a", "b", "c" }
-]
-"""
-
-TEST_JDL_SIMPLE_BUNCH = """
-[
-    Executable = "my_executable";
-    Arguments = "%s";
-    JobName = "Test_%n";
-    Parameters = 3;
-    ParameterStart = 5;
-]
-"""
-
-TEST_JDL_SIMPLE_PROGRESSION = """
-[
-    Executable = "my_executable";
-    Arguments = "%s";
-    JobName = "Test_%n";
-    Parameters = 3;
-    ParameterStart = 1;
-    ParameterStep = 1;
-    ParameterFactor = 2;
-]
-"""
-
-TEST_JDL_MULTI = """
-[
-    Executable = "my_executable";
-    Arguments = "%(A)s %(B)s";
-    JobName = "Test_%n";
-    Parameters = 3;
-    ParameterStart.A = 1;
-    ParameterStep.A = 1;
-    ParameterFactor.A = 2;
-    Parameters.B = { "a","b","c" };
-]
-"""
-
-TEST_JDL_MULTI_BAD = """
-[
-    Executable = "my_executable";
-    Arguments = "%(A)s %(B)s";
-    JobName = "Test_%n";
-    Parameters = 3;
-    ParameterStart.A = 1;
-    ParameterStep.A = 1;
-    ParameterFactor.A = 2;
-    Parameters.B = { "a","b","c","d" };
-]
-"""
-
-
-@pytest.mark.parametrize(
-    "jdl, expectedArguments",
-    [
-        (TEST_JDL_SIMPLE, ["a", "b", "c"]),
-        (TEST_JDL_SIMPLE_BUNCH, ["5", "5", "5"]),
-        (TEST_JDL_SIMPLE_PROGRESSION, ["1", "3", "7"]),
-        (TEST_JDL_MULTI, ["1 a", "3 b", "7 c"]),
-        (TEST_JDL_NO_PARAMETERS, []),
-    ],
-)
-def test_getParameterVectorLength_successful(jdl: str, expectedArguments: list[str]):
+def test_backward_compatibility_import():
+    """Test that imports from DIRAC still work (backward compatibility)"""
     # Arrange
-    jobDescription = ClassAd(jdl)
-
-    # Act
-    result = getParameterVectorLength(jobDescription)
-
-    # Assert
-    assert result["OK"], result["Message"]
-    if expectedArguments:
-        assert result["Value"] == len(expectedArguments)
-    else:
-        assert result["Value"] == None
-
-
-@pytest.mark.parametrize("jdl", [TEST_JDL_MULTI_BAD])
-def test_getParameterVectorLength_unsuccessful(jdl: str):
-    # Arrange
-    jobDescription = ClassAd(jdl)
-
-    # Act
-    result = getParameterVectorLength(jobDescription)
-
-    # Assert
-    assert not result["OK"], result["Value"]
-
-
-@pytest.mark.parametrize(
-    "jdl, expectedArguments",
+    jdl = """
     [
-        (TEST_JDL_SIMPLE, ["a", "b", "c"]),
-        (TEST_JDL_SIMPLE_BUNCH, ["5", "5", "5"]),
-        (TEST_JDL_SIMPLE_PROGRESSION, ["1", "3", "7"]),
-        (TEST_JDL_MULTI, ["1 a", "3 b", "7 c"]),
-    ],
-)
-def test_generateParametricJobs(jdl: str, expectedArguments: list[str]):
-    # Arrange
-    parametricJobDescription = ClassAd(jdl)
-
-    # Act
-    result = generateParametricJobs(parametricJobDescription)
-
-    # Assert
-    assert result["OK"], result["Message"]
-    assert result["Value"]
-    jobDescList = result["Value"]
-    assert len(jobDescList) == len(expectedArguments)
-
-    for i in range(len(jobDescList)):
-        jobDescription = ClassAd(jobDescList[i])
-        assert jobDescription.getAttributeString("JobName") == f"Test_{i}"
-        assert jobDescription.getAttributeString("Arguments") == expectedArguments[i]
+        Executable = "my_executable";
+        Arguments = "%s";
+        JobName = "Test_%n";
+        Parameters = { "a", "b", "c" }
+    ]
+    """
+
+    # Act - Test that we can import and use the functions from DIRAC
+    jobDescription = ClassAd(jdl)
+    vector_result = getParameterVectorLength(jobDescription)
+    generate_result = generateParametricJobs(jobDescription)
+
+    # Assert - Verify functions work correctly
+    assert vector_result["OK"]
+    assert vector_result["Value"] == 3
+    assert generate_result["OK"]
+    assert len(generate_result["Value"]) == 3
+
+
+# Import and run the comprehensive tests from DIRACCommon to avoid duplication
+# This ensures the DIRAC re-exports work with the full test suite
+try:
+    from DIRACCommon.tests.WorkloadManagementSystem.Utilities.test_ParametricJob import (
+        test_getParameterVectorLength_successful,
+        test_getParameterVectorLength_unsuccessful,
+        test_generateParametricJobs,
+    )
+
+    # Re-export the DIRACCommon tests so they run as part of DIRAC test suite
+    # This validates that the backward compatibility imports work correctly
+    __all__ = [
+        "test_backward_compatibility_import",
+        "test_getParameterVectorLength_successful",
+        "test_getParameterVectorLength_unsuccessful",
+        "test_generateParametricJobs",
+    ]
+
+except ImportError:
+    # If DIRACCommon tests can't be imported, just run the backward compatibility test
+    __all__ = ["test_backward_compatibility_import"]

DIRAC/WorkloadManagementSystem/Utilities/test/Test_PilotWrapper.py

@@ -136,3 +136,19 @@ def test_scriptPilot3_4():
     assert 'os.environ["someName"]="someValue"' in res
     assert "lhcb-portal.cern.ch" in res
     assert """locations += ["file:/cvmfs/dirac.egi.eu/pilot"]""" in res
+
+
+def test_scriptPilot3_5():
+    """test script creation"""
+    res = pilotWrapperScript(
+        pilotFilesCompressedEncodedDict={"proxy": "thisIsSomeProxy"},
+        pilotOptions="-l LHCb --architectureScript=dirac-architecture --CVMFS_locations=/cvmfs/lhcb.cern.ch -e LHCb -N atlasce1.lnf.infn.it -Q condor -n LCG.Frascati.it --wnVO=lhcb --architectureScript=dirac-apptainer-exec dirac-architecture -o lbRunOnly",
+        envVariables={"someName": "someValue", "someMore": "oneMore"},
+        location="lhcb-portal.cern.ch",
+        CVMFS_locations=[],
+    )
+    assert 'os.environ["someName"]="someValue"' in res
+    assert "lhcb-portal.cern.ch" in res
+    assert """locations += ["file:/cvmfs/dirac.egi.eu/pilot"]""" in res
+    assert "dirac-architecture" in res
+    assert "dirac-apptainer-exec dirac-architecture" in res

DIRAC/WorkloadManagementSystem/scripts/dirac_jobexec.py

@@ -9,6 +9,7 @@ import sys
 
 import DIRAC
 from DIRAC.Core.Base.Script import Script
+from DIRAC.Core.Utilities.ReturnValues import S_ERROR
 
 
 @Script()
@@ -87,9 +88,13 @@ def main():
             parDict[name] = value
 
     gLogger.debug("PYTHONPATH:\n%s" % ("\n".join(sys.path)))
-    jobExec = jobexec(jobXMLfile, parDict)
+    try:
+        jobExec = jobexec(jobXMLfile, parDict)
+    except Exception as e:
+        gLogger.exception("Workflow execution failed")
+        jobExec = S_ERROR(f"Workflow execution failed: {e}")
     if not jobExec["OK"]:
-        gLogger.debug("Workflow execution finished with errors, exiting")
+        gLogger.notice("Workflow execution finished with errors, exiting")
         if jobExec["Errno"]:
             sys.exit(jobExec["Errno"])
         else:

DIRAC/WorkloadManagementSystem/scripts/dirac_wms_pilot_job_info.py

@@ -19,7 +19,7 @@ def _stringInList(subStr, sList):
 
 @Script()
 def main():
-    parameters = ["OwnerDN", "StartExecTime", "EndExecTime"]
+    parameters = ["Owner", "StartExecTime", "EndExecTime"]
     Script.registerSwitch("", "Parameters=", "   List of strings to be matched by job parameters or attributes")
     # Registering arguments will automatically add their description to the help menu
     Script.registerArgument(["PilotID:  Grid ID of the pilot"])

DIRAC/__init__.py

@@ -1,68 +1,68 @@
 """
-   DIRAC - Distributed Infrastructure with Remote Agent Control
-
-   The distributed data production and analysis system of LHCb and other VOs.
-
-   DIRAC is a software framework for distributed computing which
-   allows to integrate various computing resources in a single
-   system. At the same time it integrates all kinds of computing
-   activities like Monte Carlo simulations, data processing, or
-   final user analysis.
-
-   It is build as number of cooperating systems:
-    - Accounting
-    - Configuration
-    - Core
-      - Base
-      - Security
-      - Utilities
-      - Workflow
-    - Framework
-    - RequestManagement
-    - Resources
-    - Transformation
-
-    Which are used by other system providing functionality to
-    the end user:
-    - DataManagement
-    - Interfaces
-    - ResourceStatus
-    - StorageManagement
-    - WorkloadManagement
-
-    It defines the following data members:
-    - version:       DIRAC version string
-
-    - errorMail:     mail address for important errors
-    - alarmMail:     mail address for important alarms
-
-    It loads Modules from :
-    - DIRAC.Core.Utililies
-
-    It loads:
-    - S_OK:           OK return structure
-    - S_ERROR:        ERROR return structure
-    - gLogger:        global Logger object
-    - gConfig:        global Config object
-
-    It defines the following functions:
-    - abort:          aborts execution
-    - exit:           finish execution using callbacks
-    - siteName:       returns DIRAC name for current site
-
-    - getPlatform():      DIRAC platform string for current host
-    - getPlatformTuple(): DIRAC platform tuple for current host
+DIRAC - Distributed Infrastructure with Remote Agent Control
+
+The distributed data production and analysis system of LHCb and other VOs.
+
+DIRAC is a software framework for distributed computing which
+allows to integrate various computing resources in a single
+system. At the same time it integrates all kinds of computing
+activities like Monte Carlo simulations, data processing, or
+final user analysis.
+
+It is build as number of cooperating systems:
+ - Accounting
+ - Configuration
+ - Core
+   - Base
+   - Security
+   - Utilities
+   - Workflow
+ - Framework
+ - RequestManagement
+ - Resources
+ - Transformation
+
+ Which are used by other system providing functionality to
+ the end user:
+ - DataManagement
+ - Interfaces
+ - ResourceStatus
+ - StorageManagement
+ - WorkloadManagement
+
+ It defines the following data members:
+ - version:       DIRAC version string
+
+ - errorMail:     mail address for important errors
+ - alarmMail:     mail address for important alarms
+
+ It loads Modules from :
+ - DIRAC.Core.Utililies
+
+ It loads:
+ - S_OK:           OK return structure
+ - S_ERROR:        ERROR return structure
+ - gLogger:        global Logger object
+ - gConfig:        global Config object
+
+ It defines the following functions:
+ - abort:          aborts execution
+ - exit:           finish execution using callbacks
+ - siteName:       returns DIRAC name for current site
+
+ - getPlatform():      DIRAC platform string for current host
+ - getPlatformTuple(): DIRAC platform tuple for current host
 
 """
-import os
+
 import importlib.metadata
+import os
 import re
 import sys
-import warnings
+from collections.abc import Sequence
 from pkgutil import extend_path
 from typing import Any, Optional, Union
 
-
 __path__ = extend_path(__path__, __name__)
 
 # Set the environment variable such that openssl accepts proxy cert
@@ -181,7 +181,7 @@ def initialize(
     log_level: Optional[LogLevel] = None,
     extra_config_files: Optional[list[os.PathLike]] = None,
     extra_config: Optional[dict[str, Any]] = None,
-    host_credentials: Optional[tuple[os.PathLike, os.PathLike]] = None,
+    host_credentials: Optional[Union[Sequence[os.PathLike], bool]] = None,
 ) -> None:
     """Prepare the global state so that DIRAC clients can be used.
 
@@ -227,8 +227,9 @@ def initialize(
 
     if host_credentials:
         gConfigurationData.setOptionInCFG("/DIRAC/Security/UseServerCertificate", "yes")
-        gConfigurationData.setOptionInCFG("/DIRAC/Security/CertFile", str(host_credentials[0]))
-        gConfigurationData.setOptionInCFG("/DIRAC/Security/KeyFile", str(host_credentials[1]))
+        if isinstance(host_credentials, Sequence) and len(host_credentials) == 2:
+            gConfigurationData.setOptionInCFG("/DIRAC/Security/CertFile", str(host_credentials[0]))
+            gConfigurationData.setOptionInCFG("/DIRAC/Security/KeyFile", str(host_credentials[1]))
 
     if log_level:
         gLogger.setLevel(log_level)
@@ -237,7 +238,7 @@ def initialize(
         log_level = getattr(LogLevel, gLogger.getLevel())
         gLogger.setLevel(LogLevel.ALWAYS)
     try:
-        returnValueOrRaise(localCfg.initialize())
+        returnValueOrRaise(localCfg.initialize(requireSuccessfulSync=require_auth))
     finally:
         # Restore the pre-existing log level
         gLogger.setLevel(log_level)
@@ -317,5 +318,6 @@ def extension_metadata():
         "priority": 0,
         "setups": {
             "DIRAC-Certification": "https://lbcertifdirac70.cern.ch:9135/Configuration/Server",
+            "DIRAC-CI": "https://server:9135/Configuration/Server",
         },
     }

DIRAC/tests/Utilities/testJobDefinitions.py

@@ -59,7 +59,7 @@ def helloWorld():
         try:
             J.setInputSandbox([find_all("exe-script.py", ".", "DIRAC/tests/Workflow")[0]])
         except IndexError:  # we are in Jenkins
-            J.setInputSandbox([find_all("exe-script.py", os.environ["WORKSPACE"], "DIRAC/tests/Workflow")[0]])
+            J.setInputSandbox([find_all("exe-script.py", "/home/dirac", "DIRAC/tests/Workflow")[0]])
     J.setExecutable("exe-script.py", "", "helloWorld.log")
     return endOfAllJobs(J)
 
@@ -74,7 +74,7 @@ def helloWorldJenkins():
         try:
             J.setInputSandbox([find_all("exe-script.py", ".", "DIRAC/tests/Workflow")[0]])
         except IndexError:  # we are in Jenkins
-            J.setInputSandbox([find_all("exe-script.py", os.environ["WORKSPACE"], "DIRAC/tests/Workflow")[0]])
+            J.setInputSandbox([find_all("exe-script.py", "/home/dirac", "DIRAC/tests/Workflow")[0]])
     J.setExecutable("exe-script.py", "", "helloWorld.log")
     J.setDestination("DIRAC.Jenkins.ch")
     return endOfAllJobs(J)
@@ -90,9 +90,7 @@ def helloWorld_input():
         try:
             J.setInputSandbox([find_all("exe-script-with-input.py", ".", "DIRAC/tests/Workflow")[0]])
         except IndexError:  # we are in Jenkins
-            J.setInputSandbox(
-                [find_all("exe-script-with-input.py", os.environ["WORKSPACE"], "DIRAC/tests/Workflow")[0]]
-            )
+            J.setInputSandbox([find_all("exe-script-with-input.py", "/home/dirac", "DIRAC/tests/Workflow")[0]])
     J.setExecutable("exe-script-with-input.py", "", "helloWorld.log")
     return endOfAllJobs(J)
 
@@ -108,11 +106,7 @@ def helloWorld_input_single():
             J.setInputSandbox([find_all("exe-script-with-input-single-location.py", ".", "DIRAC/tests/Workflow")[0]])
         except IndexError:  # we are in Jenkins
             J.setInputSandbox(
-                [
-                    find_all(
-                        "exe-script-with-input-single-location.py", os.environ["WORKSPACE"], "DIRAC/tests/Workflow"
-                    )[0]
-                ]
+                [find_all("exe-script-with-input-single-location.py", "/home/dirac", "DIRAC/tests/Workflow")[0]]
             )
     J.setExecutable("exe-script-with-input-single-location.py", "", "helloWorld.log")
     return endOfAllJobs(J)
@@ -128,7 +122,7 @@ def helloWorldCERN():
         try:
             J.setInputSandbox([find_all("exe-script.py", ".", "DIRAC/tests/Workflow")[0]])
         except IndexError:  # we are in Jenkins
-            J.setInputSandbox([find_all("exe-script.py", os.environ["WORKSPACE"], "DIRAC/tests/Workflow")[0]])
+            J.setInputSandbox([find_all("exe-script.py", "/home/dirac", "DIRAC/tests/Workflow")[0]])
     J.setExecutable("exe-script.py", "", "helloWorld.log")
     J.setDestination("LCG.CERN.cern")
     return endOfAllJobs(J)
@@ -144,7 +138,7 @@ def helloWorldNCBJ():
         try:
             J.setInputSandbox([find_all("exe-script.py", ".", "DIRAC/tests/Workflow")[0]])
         except IndexError:  # we are in Jenkins
-            J.setInputSandbox([find_all("exe-script.py", os.environ["WORKSPACE"], "DIRAC/tests/Workflow")[0]])
+            J.setInputSandbox([find_all("exe-script.py", "/home/dirac", "DIRAC/tests/Workflow")[0]])
     J.setExecutable("exe-script.py", "", "helloWorld.log")
     J.setDestination("LCG.NCBJ.pl")
     return endOfAllJobs(J)
@@ -160,7 +154,7 @@ def helloWorldGRIDKA():
         try:
             J.setInputSandbox([find_all("exe-script.py", ".", "DIRAC/tests/Workflow")[0]])
         except IndexError:  # we are in Jenkins
-            J.setInputSandbox([find_all("exe-script.py", os.environ["WORKSPACE"], "DIRAC/tests/Workflow")[0]])
+            J.setInputSandbox([find_all("exe-script.py", "/home/dirac", "DIRAC/tests/Workflow")[0]])
     J.setExecutable("exe-script.py", "", "helloWorld.log")
     J.setDestination("LCG.GRIDKA.de")
     return endOfAllJobs(J)
@@ -176,7 +170,7 @@ def helloWorldRAL():
         try:
             J.setInputSandbox([find_all("exe-script.py", ".", "DIRAC/tests/Workflow")[0]])
         except IndexError:  # we are in Jenkins
-            J.setInputSandbox([find_all("exe-script.py", os.environ["WORKSPACE"], "DIRAC/tests/Workflow")[0]])
+            J.setInputSandbox([find_all("exe-script.py", "/home/dirac", "DIRAC/tests/Workflow")[0]])
     J.setExecutable("exe-script.py", "", "helloWorld.log")
     J.setDestination("LCG.RAL.uk")
     return endOfAllJobs(J)
@@ -192,7 +186,7 @@ def helloWorldPIC():
         try:
             J.setInputSandbox([find_all("exe-script.py", ".", "DIRAC/tests/Workflow")[0]])
         except IndexError:  # we are in Jenkins
-            J.setInputSandbox([find_all("exe-script.py", os.environ["WORKSPACE"], "DIRAC/tests/Workflow")[0]])
+            J.setInputSandbox([find_all("exe-script.py", "/home/dirac", "DIRAC/tests/Workflow")[0]])
     J.setExecutable("exe-script.py", "", "helloWorld.log")
     J.setDestination("LCG.PIC.es")
     return endOfAllJobs(J)
@@ -208,7 +202,7 @@ def helloWorldRALPP():
         try:
             J.setInputSandbox([find_all("exe-script.py", ".", "DIRAC/tests/Workflow")[0]])
         except IndexError:  # we are in Jenkins
-            J.setInputSandbox([find_all("exe-script.py", os.environ["WORKSPACE"], "DIRAC/tests/Workflow")[0]])
+            J.setInputSandbox([find_all("exe-script.py", "/home/dirac", "DIRAC/tests/Workflow")[0]])
     J.setExecutable("exe-script.py", "", "helloWorld.log")
     J.setDestination("LCG.UKI-SOUTHGRID-RALPP.uk")
     return endOfAllJobs(J)
@@ -224,7 +218,7 @@ def helloWorldGRIF():
         try:
             J.setInputSandbox([find_all("exe-script.py", ".", "DIRAC/tests/Workflow")[0]])
         except IndexError:  # we are in Jenkins
-            J.setInputSandbox([find_all("exe-script.py", os.environ["WORKSPACE"], "DIRAC/tests/Workflow")[0]])
+            J.setInputSandbox([find_all("exe-script.py", "/home/dirac", "DIRAC/tests/Workflow")[0]])
     J.setExecutable("exe-script.py", "", "helloWorld.log")
     J.setDestination("LCG.GRIF.fr")
     return endOfAllJobs(J)
@@ -240,7 +234,7 @@ def helloWorldSSHBatch():
         try:
             J.setInputSandbox([find_all("exe-script.py", ".", "DIRAC/tests/Workflow")[0]])
         except IndexError:  # we are in Jenkins
-            J.setInputSandbox([find_all("exe-script.py", os.environ["WORKSPACE"], "DIRAC/tests/Workflow")[0]])
+            J.setInputSandbox([find_all("exe-script.py", "/home/dirac", "DIRAC/tests/Workflow")[0]])
     J.setExecutable("exe-script.py", "", "helloWorld.log")
     J.setDestination("DIRAC.Jenkins_SSHBatch.ch")
     return endOfAllJobs(J)
@@ -256,7 +250,7 @@ def helloWorldARM():
         try:
             J.setInputSandbox([find_all("exe-script.py", ".", "DIRAC/tests/Workflow")[0]])
         except IndexError:  # we are in Jenkins
-            J.setInputSandbox([find_all("exe-script.py", os.environ["WORKSPACE"], "DIRAC/tests/Workflow")[0]])
+            J.setInputSandbox([find_all("exe-script.py", "/home/dirac", "DIRAC/tests/Workflow")[0]])
     J.setExecutable("exe-script.py", "", "helloWorld.log")
     J.setDestination("DIRAC.ARM.ch")
     return endOfAllJobs(J)
@@ -272,7 +266,7 @@ def helloWorldCloudCE():
         try:
             J.setInputSandbox([find_all("exe-script.py", ".", "DIRAC/tests/Workflow")[0]])
         except IndexError:  # we are in Jenkins
-            J.setInputSandbox([find_all("exe-script.py", os.environ["WORKSPACE"], "DIRAC/tests/Workflow")[0]])
+            J.setInputSandbox([find_all("exe-script.py", "/home/dirac", "DIRAC/tests/Workflow")[0]])
     J.setExecutable("exe-script.py", "", "helloWorldCloud.log")
     J.setDestinationCE("stealthcloud.ic.ac.uk", "LCG.UKI-LT2-IC-HEP.uk")
     return endOfAllJobs(J)
@@ -288,7 +282,7 @@ def mpJob():
         try:
             J.setInputSandbox([find_all("mpTest.py", ".", "DIRAC/tests/Utilities")[0]])
         except IndexError:  # we are in Jenkins
-            J.setInputSandbox([find_all("mpTest.py", os.environ["WORKSPACE"], "DIRAC/tests/Utilities")[0]])
+            J.setInputSandbox([find_all("mpTest.py", "/home/dirac", "DIRAC/tests/Utilities")[0]])
 
     J.setExecutable("mpTest.py")
     J.setTag(["4Processors", "MultiProcessor"])
@@ -305,7 +299,7 @@ def mp3Job():
         try:
             J.setInputSandbox([find_all("mpTest.py", ".", "DIRAC/tests/Utilities")[0]])
         except IndexError:  # we are in Jenkins
-            J.setInputSandbox([find_all("mpTest.py", os.environ["WORKSPACE"], "DIRAC/tests/Utilities")[0]])
+            J.setInputSandbox([find_all("mpTest.py", "/home/dirac", "DIRAC/tests/Utilities")[0]])
 
     J.setExecutable("mpTest.py")
     J.setNumberOfProcessors(numberOfProcessors=3)
@@ -322,7 +316,7 @@ def min2max4Job():
         try:
             J.setInputSandbox([find_all("mpTest.py", ".", "DIRAC/tests/Utilities")[0]])
         except IndexError:  # we are in Jenkins
-            J.setInputSandbox([find_all("mpTest.py", os.environ["WORKSPACE"], "DIRAC/tests/Utilities")[0]])
+            J.setInputSandbox([find_all("mpTest.py", "/home/dirac", "DIRAC/tests/Utilities")[0]])
 
     J.setExecutable("mpTest.py")
     J.setNumberOfProcessors(minNumberOfProcessors=2, maxNumberOfProcessors=4)
@@ -339,7 +333,7 @@ def wholeNodeJob():
         try:
             J.setInputSandbox([find_all("mpTest.py", ".", "DIRAC/tests/Utilities")[0]])
         except IndexError:  # we are in Jenkins
-            J.setInputSandbox([find_all("mpTest.py", os.environ["WORKSPACE"], "DIRAC/tests/Utilities")[0]])
+            J.setInputSandbox([find_all("mpTest.py", "/home/dirac", "DIRAC/tests/Utilities")[0]])
 
     J.setExecutable("mpTest.py")
     J.setTag(["WholeNode", "MultiProcessor"])
@@ -356,7 +350,7 @@ def parametricJob():
         try:
             J.setInputSandbox([find_all("exe-script.py", ".", "DIRAC/tests/Workflow")[0]])
         except IndexError:  # we are in Jenkins
-            J.setInputSandbox([find_all("exe-script.py", os.environ["WORKSPACE"], "DIRAC/tests/Workflow")[0]])
+            J.setInputSandbox([find_all("exe-script.py", "/home/dirac", "DIRAC/tests/Workflow")[0]])
     J.setParameterSequence("args", ["one", "two", "three"])
     J.setParameterSequence("iargs", [1, 2, 3])
     J.setExecutable("exe-script.py", arguments=": testing %(args)s %(iargs)s", logFile="helloWorld_%n.log")
@@ -373,7 +367,7 @@ def parametricJobInputData():
         try:
             J.setInputSandbox([find_all("exe-script.py", ".", "DIRAC/tests/Workflow")[0]])
         except IndexError:  # we are in Jenkins
-            J.setInputSandbox([find_all("exe-script.py", os.environ["WORKSPACE"], "DIRAC/tests/Workflow")[0]])
+            J.setInputSandbox([find_all("exe-script.py", "/home/dirac", "DIRAC/tests/Workflow")[0]])
     J.setParameterSequence("args", ["one", "two", "three"])
     J.setParameterSequence("iargs", [1, 2, 3])
     J.setParameterSequence(
@@ -404,7 +398,7 @@ def jobWithOutput():
         try:
             inp2 = [find_all("exe-script.py", ".", "DIRAC/tests/Workflow")[0]]
         except IndexError:  # we are in Jenkins
-            inp2 = [find_all("exe-script.py", os.environ["WORKSPACE"], "DIRAC/tests/Workflow")[0]]
+            inp2 = [find_all("exe-script.py", "/home/dirac", "DIRAC/tests/Workflow")[0]]
         J.setInputSandbox(inp1 + inp2)
     J.setExecutable("exe-script.py", "", "helloWorld.log")
     J.setOutputData([timenow + "testFileUpload.txt"])
@@ -434,7 +428,7 @@ def jobWithOutputs():
         try:
             inp2 = [find_all("exe-script.py", ".", "DIRAC/tests/Workflow")[0]]
         except IndexError:  # we are in Jenkins
-            inp2 = [find_all("exe-script.py", os.environ["WORKSPACE"], "DIRAC/tests/Workflow")[0]]
+            inp2 = [find_all("exe-script.py", "/home/dirac", "DIRAC/tests/Workflow")[0]]
         J.setInputSandbox(inp1 + inp2)
     J.setExecutable("exe-script.py", "", "helloWorld.log")
     J.setOutputData([timenow + "testFileUpload.txt"], outputSE=["RAL-SE", "IN2P3-SE"])

{DIRAC-9.0.0a42.dist-info → dirac-9.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: DIRAC
-Version: 9.0.0a42
+Version: 9.0.7
 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,8 +19,10 @@ Requires-Dist: cachetools
 Requires-Dist: certifi
 Requires-Dist: cwltool
 Requires-Dist: diraccfg
-Requires-Dist: diracx-client>=v0.0.1a18
-Requires-Dist: diracx-core>=v0.0.1a18
+Requires-Dist: DIRACCommon==v9.0.7
+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
@@ -39,12 +41,12 @@ Requires-Dist: python-dateutil
 Requires-Dist: pytz
 Requires-Dist: requests
 Requires-Dist: rucio-clients>=34.4.2
-Requires-Dist: setuptools
 Requires-Dist: sqlalchemy
 Requires-Dist: typing_extensions>=4.3.0
 Requires-Dist: Authlib>=1.0.0.a2
 Requires-Dist: pyjwt
 Requires-Dist: dominate
+Requires-Dist: zstandard
 Provides-Extra: server
 Requires-Dist: CMRESHandler; extra == "server"
 Requires-Dist: opensearch-py; extra == "server"
@@ -71,6 +73,7 @@ Requires-Dist: pytest-cov; extra == "testing"
 Requires-Dist: pytest-mock; extra == "testing"
 Requires-Dist: pytest-rerunfailures; extra == "testing"
 Requires-Dist: pycodestyle; extra == "testing"
+Dynamic: license-file
 
 .. -*- mode: rst -*-