diff --git a/.release-please-manifest.json b/.release-please-manifest.json index ee2bfff..1b1f6a8 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "0.9.3" + ".": "0.9.4" } diff --git a/AUTHORS.md b/AUTHORS.md index b7419ee..fb66474 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -11,6 +11,7 @@ The list of contributors in alphabetical order: - [Dinos Kousidis](https://orcid.org/0000-0002-4914-4289) - [Giuseppe Steduto](https://orcid.org/0009-0002-1258-8553) - [Jan Okraska](https://orcid.org/0000-0002-1416-3244) +- [Manuel Giffels](https://orcid.org/0000-0003-0193-3032) - [Marco Donadoni](https://orcid.org/0000-0003-2922-5505) - [Marco Vidal](https://orcid.org/0000-0002-9363-4971) - [Rokas Maciulaitis](https://orcid.org/0000-0003-1064-6967) diff --git a/CHANGELOG.md b/CHANGELOG.md index d8f61e7..6126271 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [0.9.4](https://github.com/reanahub/reana-workflow-engine-serial/compare/0.9.3...0.9.4) (2024-11-29) + + +### Build + +* **docker:** pin setuptools 70 ([#216](https://github.com/reanahub/reana-workflow-engine-serial/issues/216)) ([f94d003](https://github.com/reanahub/reana-workflow-engine-serial/commit/f94d0036ded9562155528d52f33110e43c954384)) +* **python:** bump shared REANA packages as of 2024-11-28 ([#218](https://github.com/reanahub/reana-workflow-engine-serial/issues/218)) ([430fd04](https://github.com/reanahub/reana-workflow-engine-serial/commit/430fd04acb6485754a0cc5fa4dbeefd3aaa022e4)) + + +### Features + +* **tasks:** allow Compute4PUNCH backend options ([#210](https://github.com/reanahub/reana-workflow-engine-serial/issues/210)) ([a6313f2](https://github.com/reanahub/reana-workflow-engine-serial/commit/a6313f22dcdcab08a84b3dd6c8ce7386122d7400)) + ## [0.9.3](https://github.com/reanahub/reana-workflow-engine-serial/compare/0.9.2...0.9.3) (2024-03-04) diff --git a/reana_workflow_engine_serial/tasks.py b/reana_workflow_engine_serial/tasks.py index 8438f79..4448b3d 100644 --- a/reana_workflow_engine_serial/tasks.py +++ b/reana_workflow_engine_serial/tasks.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # # This file is part of REANA. -# Copyright (C) 2018, 2019, 2020, 2021, 2022 CERN. +# Copyright (C) 2018, 2019, 2020, 2021, 2022, 2023, 2024 CERN. # # REANA is free software; you can redistribute it and/or modify it # under the terms of the MIT License; see LICENSE file for more details. @@ -124,6 +124,9 @@ def run_step( htcondor_accounting_group=step.get("htcondor_accounting_group", ""), slurm_partition=step.get("slurm_partition"), slurm_time=step.get("slurm_time"), + c4p_cpu_cores=step.get("c4p_cpu_cores"), + c4p_memory_limit=step.get("c4p_memory_limit"), + c4p_additional_requirements=step.get("c4p_additional_requirements"), ) job_spec_copy = dict(job_spec) job_spec_copy["cmd"] = command diff --git a/reana_workflow_engine_serial/utils.py b/reana_workflow_engine_serial/utils.py index 5c3c18b..7208e78 100644 --- a/reana_workflow_engine_serial/utils.py +++ b/reana_workflow_engine_serial/utils.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # # This file is part of REANA. -# Copyright (C) 2019, 2020, 2021, 2022 CERN. +# Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024 CERN. # # REANA is free software; you can redistribute it and/or modify it # under the terms of the MIT License; see LICENSE file for more details. @@ -36,6 +36,9 @@ def build_job_spec( htcondor_accounting_group, slurm_partition, slurm_time, + c4p_cpu_cores, + c4p_memory_limit, + c4p_additional_requirements, ): """Build job specification to passed to RJC.""" job_spec = { @@ -58,6 +61,9 @@ def build_job_spec( "htcondor_accounting_group": htcondor_accounting_group, "slurm_partition": slurm_partition, "slurm_time": slurm_time, + "c4p_cpu_cores": c4p_cpu_cores, + "c4p_memory_limit": c4p_memory_limit, + "c4p_additional_requirements": c4p_additional_requirements, } return job_spec diff --git a/reana_workflow_engine_serial/version.py b/reana_workflow_engine_serial/version.py index e52a4e5..2aaeada 100755 --- a/reana_workflow_engine_serial/version.py +++ b/reana_workflow_engine_serial/version.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # # This file is part of REANA. -# Copyright (C) 2018, 2019, 2020, 2021, 2022, 2023 CERN. +# Copyright (C) 2018, 2019, 2020, 2021, 2022, 2023, 2024 CERN. # # REANA is free software; you can redistribute it and/or modify it # under the terms of the MIT License; see LICENSE file for more details. diff --git a/setup.py b/setup.py index bebce4b..d9abd8e 100755 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # # This file is part of REANA. -# Copyright (C) 2018, 2019, 2020, 2021, 2022 CERN. +# Copyright (C) 2018, 2019, 2020, 2021, 2022, 2024 CERN. # # REANA is free software; you can redistribute it and/or modify it # under the terms of the MIT License; see LICENSE file for more details.