From a6313f22dcdcab08a84b3dd6c8ce7386122d7400 Mon Sep 17 00:00:00 2001 From: Manuel Giffels Date: Mon, 1 Jul 2024 15:33:34 +0200 Subject: [PATCH 1/4] feat(tasks): allow Compute4PUNCH backend options (#210) --- AUTHORS.md | 1 + reana_workflow_engine_serial/tasks.py | 5 ++++- reana_workflow_engine_serial/utils.py | 8 +++++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 7ada2b7..bfd8d36 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/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 From f94d0036ded9562155528d52f33110e43c954384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tibor=20=C5=A0imko?= Date: Mon, 2 Sep 2024 17:28:16 +0200 Subject: [PATCH 2/4] build(docker): pin setuptools 70 (#216) Pin `setuptools` to the maximum version of 70 to allow working on Ubuntu 20.04 LTS based environments. (New versions of `setuptools` are not compatible.) Note that this fix is necessary only for the `maint-0.9` branches and the REANA 0.9 release series. In `master` we have switched to Ubuntu 24.04 LTS based environments and Python 3.12 and no pinning is necessary there. --- .github/workflows/ci.yml | 4 ++-- Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f464f5e..1ee1108 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -133,7 +133,7 @@ jobs: - name: Install Python dependencies run: | - pip install --upgrade pip setuptools py + pip install --upgrade pip 'setuptools<71' py pip install -e .[all] - name: Run Sphinx documentation with doctests @@ -152,7 +152,7 @@ jobs: - name: Install Python dependencies run: | - pip install --upgrade pip setuptools py + pip install --upgrade pip 'setuptools<71' py pip install twine wheel pip install -e .[all] diff --git a/Dockerfile b/Dockerfile index 5e59bc6..c35c2ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # 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. @@ -27,7 +27,7 @@ RUN apt-get update -y && \ python3-dev \ python3-pip \ vim-tiny && \ - pip install --no-cache-dir --upgrade pip setuptools && \ + pip install --no-cache-dir --upgrade pip 'setuptools<71' && \ pip install --no-cache-dir -r /code/requirements.txt && \ apt-get remove -y \ gcc \ From 430fd04acb6485754a0cc5fa4dbeefd3aaa022e4 Mon Sep 17 00:00:00 2001 From: Marco Donadoni Date: Thu, 28 Nov 2024 11:32:12 +0100 Subject: [PATCH 3/4] build(python): bump shared REANA packages as of 2024-11-28 (#218) --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index a65ff0c..f6366b0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -30,7 +30,7 @@ pyrsistent==0.20.0 # via jsonschema python-dateutil==2.9.0 # via bravado, bravado-core pytz==2024.1 # via bravado-core pyyaml==6.0.1 # via bravado, bravado-core, reana-commons, swagger-spec-validator -reana-commons==0.9.8 # via reana-workflow-engine-serial (setup.py) +reana-commons==0.9.9 # via reana-workflow-engine-serial (setup.py) requests==2.31.0 # via bravado, bravado-core rfc3987==1.3.8 # via jsonschema simplejson==3.19.2 # via bravado, bravado-core diff --git a/setup.py b/setup.py index dd6615c..227bc58 100755 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ ] install_requires = [ - "reana-commons>=0.9.8,<0.10.0", + "reana-commons>=0.9.9,<0.10.0", ] packages = find_packages() From 85748f5418bcb41bd4f8248a6fb66efe97583da2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 29 Nov 2024 10:33:41 +0000 Subject: [PATCH 4/4] chore(maint-0.9): release 0.9.4 --- .release-please-manifest.json | 2 +- CHANGELOG.md | 13 +++++++++++++ Dockerfile | 4 ++-- reana_workflow_engine_serial/version.py | 2 +- 4 files changed, 17 insertions(+), 4 deletions(-) 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/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/Dockerfile b/Dockerfile index c35c2ac..0dc0190 100644 --- a/Dockerfile +++ b/Dockerfile @@ -63,7 +63,7 @@ ENV TERM=xterm \ # Set image labels LABEL org.opencontainers.image.authors="team@reanahub.io" -LABEL org.opencontainers.image.created="2024-03-04" +LABEL org.opencontainers.image.created="2024-11-29" LABEL org.opencontainers.image.description="REANA reproducible analysis platform - Serial workflow engine component" LABEL org.opencontainers.image.documentation="https://reana-workflow-engine-serial.readthedocs.io/" LABEL org.opencontainers.image.licenses="MIT" @@ -72,5 +72,5 @@ LABEL org.opencontainers.image.title="reana-workflow-engine-serial" LABEL org.opencontainers.image.url="https://github.com/reanahub/reana-workflow-engine-serial" LABEL org.opencontainers.image.vendor="reanahub" # x-release-please-start-version -LABEL org.opencontainers.image.version="0.9.3" +LABEL org.opencontainers.image.version="0.9.4" # x-release-please-end diff --git a/reana_workflow_engine_serial/version.py b/reana_workflow_engine_serial/version.py index 56f035e..504869f 100755 --- a/reana_workflow_engine_serial/version.py +++ b/reana_workflow_engine_serial/version.py @@ -14,4 +14,4 @@ from __future__ import absolute_import, print_function -__version__ = "0.9.3" +__version__ = "0.9.4"