From 1ce8e6a41f14996c50c53fcd7e84565626756ace Mon Sep 17 00:00:00 2001 From: Manuel Giffels Date: Mon, 1 Jul 2024 15:55:27 +0200 Subject: [PATCH 1/4] feat(externalbackend): allow Compute4PUNCH backend options (#269) --- AUTHORS.md | 1 + reana_workflow_engine_yadage/externalbackend.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/AUTHORS.md b/AUTHORS.md index 29e4850..ad7771e 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -12,6 +12,7 @@ The list of contributors in alphabetical order: - [Giuseppe Steduto](https://orcid.org/0009-0002-1258-8553) - [Jan Okraska](https://orcid.org/0000-0002-1416-3244) - [Lukas Heinrich](https://orcid.org/0000-0002-4048-7584) +- [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) - [Parth Shandilya](https://github.com/ParthS007) diff --git a/reana_workflow_engine_yadage/externalbackend.py b/reana_workflow_engine_yadage/externalbackend.py index a0a44e5..918364e 100644 --- a/reana_workflow_engine_yadage/externalbackend.py +++ b/reana_workflow_engine_yadage/externalbackend.py @@ -88,6 +88,9 @@ def set_parameter(resource: Dict[str, Any], key: str) -> None: set_parameter(item, "htcondor_accounting_group") set_parameter(item, "slurm_partition") set_parameter(item, "slurm_time") + set_parameter(item, "c4p_cpu_cores") + set_parameter(item, "c4p_memory_limit") + set_parameter(item, "c4p_additional_requirements") if "kerberos" not in parameters: parameters["kerberos"] = WORKFLOW_KERBEROS From bc505d84a4092610e883e766ad08d2efefe8d908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tibor=20=C5=A0imko?= Date: Mon, 2 Sep 2024 17:31:25 +0200 Subject: [PATCH 2/4] build(docker): pin setuptools 70 (#274) 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. --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index beaa148..30a8091 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # This file is part of REANA. -# Copyright (C) 2017, 2018, 2019, 2020, 2021, 2022, 2023 CERN. +# Copyright (C) 2017, 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. @@ -37,7 +37,7 @@ RUN apt-get update -y && \ python3-pip \ unzip \ 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 \ autoconf \ From 59111432c2c5a7fea98a71ffb2d78a9e7c1a47af Mon Sep 17 00:00:00 2001 From: Marco Donadoni Date: Thu, 28 Nov 2024 11:33:11 +0100 Subject: [PATCH 3/4] build(python): bump shared REANA packages as of 2024-11-28 (#276) --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index d4a8647..339db37 100644 --- a/requirements.txt +++ b/requirements.txt @@ -44,7 +44,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, packtivity, reana-commons, swagger-spec-validator, yadage, yadage-schemas -reana-commons[yadage]==0.9.8 # via reana-workflow-engine-yadage (setup.py) +reana-commons[yadage]==0.9.9 # via reana-workflow-engine-yadage (setup.py) requests[security]==2.31.0 # via bravado, bravado-core, packtivity, reana-workflow-engine-yadage (setup.py), yadage, yadage-schemas rfc3987==1.3.8 # via jsonschema, reana-workflow-engine-yadage (setup.py) simplejson==3.19.2 # via bravado, bravado-core diff --git a/setup.py b/setup.py index 23100cc..37b0e6b 100644 --- a/setup.py +++ b/setup.py @@ -66,7 +66,7 @@ "packtivity==0.14.24", "yadage==0.20.1", "yadage-schemas==0.10.6", - "reana-commons[yadage]>=0.9.8,<0.10.0", + "reana-commons[yadage]>=0.9.9,<0.10.0", "requests>=2.25.1", "rfc3987==1.3.8", # FIXME remove once yadage-schemas solves yadage deps. ] From 597461a39c5e35eb69a7d42ed7141a3a83214578 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:34:01 +0000 Subject: [PATCH 4/4] chore(maint-0.9): release 0.9.5 --- .release-please-manifest.json | 2 +- CHANGELOG.md | 13 +++++++++++++ Dockerfile | 4 ++-- reana_workflow_engine_yadage/version.py | 2 +- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 1b1f6a8..871c1ad 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "0.9.4" + ".": "0.9.5" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a5afc4..5ab26c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [0.9.5](https://github.com/reanahub/reana-workflow-engine-yadage/compare/0.9.4...0.9.5) (2024-11-29) + + +### Build + +* **docker:** pin setuptools 70 ([#274](https://github.com/reanahub/reana-workflow-engine-yadage/issues/274)) ([bc505d8](https://github.com/reanahub/reana-workflow-engine-yadage/commit/bc505d84a4092610e883e766ad08d2efefe8d908)) +* **python:** bump shared REANA packages as of 2024-11-28 ([#276](https://github.com/reanahub/reana-workflow-engine-yadage/issues/276)) ([5911143](https://github.com/reanahub/reana-workflow-engine-yadage/commit/59111432c2c5a7fea98a71ffb2d78a9e7c1a47af)) + + +### Features + +* **externalbackend:** allow Compute4PUNCH backend options ([#269](https://github.com/reanahub/reana-workflow-engine-yadage/issues/269)) ([1ce8e6a](https://github.com/reanahub/reana-workflow-engine-yadage/commit/1ce8e6a41f14996c50c53fcd7e84565626756ace)) + ## [0.9.4](https://github.com/reanahub/reana-workflow-engine-yadage/compare/0.9.3...0.9.4) (2024-03-04) diff --git a/Dockerfile b/Dockerfile index 30a8091..a2a5fc4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -80,7 +80,7 @@ ENV PACKTIVITY_ASYNCBACKEND=reana_workflow_engine_yadage.externalbackend:Externa # 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 - Yadage workflow engine component" LABEL org.opencontainers.image.documentation="https://reana-workflow-engine-yadage.readthedocs.io/" LABEL org.opencontainers.image.licenses="MIT" @@ -89,5 +89,5 @@ LABEL org.opencontainers.image.title="reana-workflow-engine-yadage" LABEL org.opencontainers.image.url="https://github.com/reanahub/reana-workflow-engine-yadage" LABEL org.opencontainers.image.vendor="reanahub" # x-release-please-start-version -LABEL org.opencontainers.image.version="0.9.4" +LABEL org.opencontainers.image.version="0.9.5" # x-release-please-end diff --git a/reana_workflow_engine_yadage/version.py b/reana_workflow_engine_yadage/version.py index 3148436..e0db589 100644 --- a/reana_workflow_engine_yadage/version.py +++ b/reana_workflow_engine_yadage/version.py @@ -14,4 +14,4 @@ from __future__ import absolute_import, print_function -__version__ = "0.9.4" +__version__ = "0.9.5"