CTADIRAC 2.2.84__tar.gz → 2.2.85__tar.gz

{ctadirac-2.2.84/src/CTADIRAC.egg-info → ctadirac-2.2.85}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CTADIRAC
-Version: 2.2.84
+Version: 2.2.85
 Summary: CTADIRAC is an extension of the DIRAC interware for dedicated CTA usage.
 Author-email: Luisa Arrabito <arrabito@in2p3.fr>
 License: BSD 3-Clause License
@@ -15,7 +15,7 @@ Classifier: Topic :: System :: Distributed Computing
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENCE
-Requires-Dist: DIRAC==8.0.71
+Requires-Dist: DIRAC==8.0.78
 Requires-Dist: ruamel.yaml
 Requires-Dist: shellescape
 Requires-Dist: matplotlib

{ctadirac-2.2.84 → ctadirac-2.2.85}/docker/dirac-client/Dockerfile

@@ -34,6 +34,8 @@ WORKDIR ${DIRAC_DIR}
 # Install DIRAC client
 USER dirac
 
+RUN git config --global --add safe.directory /CTADIRAC/
+
 RUN curl -LO https://github.com/DIRACGrid/DIRACOS2/releases/latest/download/DIRACOS-Linux-x86_64.sh \
     && bash DIRACOS-Linux-x86_64.sh -p ${DIRAC_DIR}/diracos \
     && rm -f DIRACOS-Linux-x86_64.sh \

{ctadirac-2.2.84 → ctadirac-2.2.85}/pyproject.toml

@@ -15,7 +15,7 @@ classifiers = [
 ]
 license = { text = "BSD 3-Clause License" }
 dependencies = [
-    "DIRAC==8.0.71",
+    "DIRAC==8.0.78",
     "ruamel.yaml",
     "shellescape",
     "matplotlib",

{ctadirac-2.2.84 → ctadirac-2.2.85}/src/CTADIRAC/Interfaces/API/CWLJob.py

@@ -7,7 +7,6 @@ from cwl_utils.parser import save
 from DIRAC.Interfaces.API.Dirac import Dirac
 from DIRAC.Interfaces.API.Job import Job
 from ruamel.yaml import YAML
-
 from CTADIRAC.Interfaces.Utilities.CWLTranslator import CWLTranslator
 
 
@@ -32,11 +31,10 @@ class CWLJob(Job, CWLTranslator):
     ) -> None:
         Job.__init__(self)
         CWLTranslator.__init__(self, cwl_workflow, cwl_inputs)
-
+        self.logfile_name = "cwl_job"
         self.cvmfs_base_path = cvmfs_base_path
         self.apptainer_options = apptainer_options if apptainer_options else []
         self._output_se = output_se
-
         self.translate(self.cvmfs_base_path, self.apptainer_options)
 
     def submit(self):
@@ -48,14 +46,12 @@ class CWLJob(Job, CWLTranslator):
         """
         dirac = Dirac()
         yaml = YAML()
-
         # Create the modified Dirac compliant CWL workflow and inputs files to submit
         with tempfile.NamedTemporaryFile(
             suffix=f"_{self.cwl_workflow_path.name}"
         ) as temp_workflow:
             yaml.dump(save(self.transformed_cwl), temp_workflow)
             temp_workflow.flush()
-
             with tempfile.NamedTemporaryFile(
                 suffix=f"_{self.cwl_inputs_path.name}"
             ) as temp_inputs:
@@ -76,9 +72,10 @@ class CWLJob(Job, CWLTranslator):
                 arguments_str = (
                     f"{Path(temp_workflow.name).name} {Path(temp_inputs.name).name}"
                 )
-
                 self.setExecutable(
-                    "cwltool", arguments=arguments_str, logFile=f"{self.name}.log"
+                    "cwltool",
+                    arguments=arguments_str,
+                    logFile=f"{self.logfile_name}.log",
                 )
                 res = dirac.submitJob(self)
         return res