From 9b2a3d0872329e79d0b2d9a0972b0c09f08ff694 Mon Sep 17 00:00:00 2001 From: Manuel Giffels Date: Mon, 1 Jul 2024 15:40:24 +0200 Subject: [PATCH 1/4] feat(task): allow Compute4PUNCH backend options (#277) --- AUTHORS.md | 1 + reana_workflow_engine_cwl/cwl_reana.py | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/AUTHORS.md b/AUTHORS.md index a38cfae..c820f74 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -13,6 +13,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) - [Michael R. Crusoe](https://orcid.org/0000-0002-2961-9670) diff --git a/reana_workflow_engine_cwl/cwl_reana.py b/reana_workflow_engine_cwl/cwl_reana.py index 97d4c77..6a163b1 100644 --- a/reana_workflow_engine_cwl/cwl_reana.py +++ b/reana_workflow_engine_cwl/cwl_reana.py @@ -270,6 +270,9 @@ def shouldquote(x): kubernetes_uid = self._get_hint("kubernetes_uid") kubernetes_memory_limit = self._get_hint("kubernetes_memory_limit") kubernetes_job_timeout = self._get_hint("kubernetes_job_timeout") + c4p_cpu_cores = self._get_hint("c4p_cpu_cores") + c4p_memory_limit = self._get_hint("c4p_memory_limit") + c4p_additional_requirements = self._get_hint("c4p_additional_requirements") create_body = { "image": container, "cmd": wrapped_cmd, @@ -290,6 +293,9 @@ def shouldquote(x): "kubernetes_job_timeout": kubernetes_job_timeout, "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 create_body From 3c2cd8a474d167574bf8746b6430f4ae13a83e61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tibor=20=C5=A0imko?= Date: Mon, 2 Sep 2024 17:27:38 +0200 Subject: [PATCH 2/4] build(docker): pin setuptools 70 (#287) 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 d2d96b3..7cd11da 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 5081f5d..f52e709 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. @@ -28,7 +28,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 f9d3688858e6f1ff52fa58fecd9ce233dd97b0e1 Mon Sep 17 00:00:00 2001 From: Marco Donadoni Date: Thu, 28 Nov 2024 11:31:33 +0100 Subject: [PATCH 3/4] build(python): bump shared REANA packages as of 2024-11-28 (#289) --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 98a27c7..bdb7959 100644 --- a/requirements.txt +++ b/requirements.txt @@ -48,7 +48,7 @@ python-dateutil==2.9.0 # via bravado, bravado-core, prov pytz==2024.1 # via bravado-core pyyaml==6.0.1 # via bravado, bravado-core, reana-commons, swagger-spec-validator rdflib==5.0.0 # via cwltool, prov, schema-salad -reana-commons[cwl]==0.9.8 # via reana-workflow-engine-cwl (setup.py) +reana-commons[cwl]==0.9.9 # via reana-workflow-engine-cwl (setup.py) requests==2.31.0 # via bravado, bravado-core, cachecontrol, cwltool, schema-salad rfc3987==1.3.8 # via jsonschema ruamel-yaml==0.17.10 # via cwltool, schema-salad diff --git a/setup.py b/setup.py index f4ea0d0..473e75a 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ ] install_requires = [ - "reana-commons[cwl]>=0.9.8,<0.10.0", + "reana-commons[cwl]>=0.9.9,<0.10.0", ] packages = find_packages() From 3efaadd928f0dc96e83dcbbfc0d984a515cadd0a 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:12 +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_cwl/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 80bbb38..96ea899 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [0.9.4](https://github.com/reanahub/reana-workflow-engine-cwl/compare/0.9.3...0.9.4) (2024-11-29) + + +### Build + +* **docker:** pin setuptools 70 ([#287](https://github.com/reanahub/reana-workflow-engine-cwl/issues/287)) ([3c2cd8a](https://github.com/reanahub/reana-workflow-engine-cwl/commit/3c2cd8a474d167574bf8746b6430f4ae13a83e61)) +* **python:** bump shared REANA packages as of 2024-11-28 ([#289](https://github.com/reanahub/reana-workflow-engine-cwl/issues/289)) ([f9d3688](https://github.com/reanahub/reana-workflow-engine-cwl/commit/f9d3688858e6f1ff52fa58fecd9ce233dd97b0e1)) + + +### Features + +* **task:** allow Compute4PUNCH backend options ([#277](https://github.com/reanahub/reana-workflow-engine-cwl/issues/277)) ([9b2a3d0](https://github.com/reanahub/reana-workflow-engine-cwl/commit/9b2a3d0872329e79d0b2d9a0972b0c09f08ff694)) + ## [0.9.3](https://github.com/reanahub/reana-workflow-engine-cwl/compare/0.9.2...0.9.3) (2024-03-04) diff --git a/Dockerfile b/Dockerfile index f52e709..00866c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -64,7 +64,7 @@ ENV PYTHONPATH=/workdir \ # 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 - CWL workflow engine component" LABEL org.opencontainers.image.documentation="https://reana-workflow-engine-cwl.readthedocs.io/" LABEL org.opencontainers.image.licenses="MIT" @@ -73,5 +73,5 @@ LABEL org.opencontainers.image.title="reana-workflow-engine-cwl" LABEL org.opencontainers.image.url="https://github.com/reanahub/reana-workflow-engine-cwl" 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_cwl/version.py b/reana_workflow_engine_cwl/version.py index 6f9a92a..3148436 100644 --- a/reana_workflow_engine_cwl/version.py +++ b/reana_workflow_engine_cwl/version.py @@ -14,4 +14,4 @@ from __future__ import absolute_import, print_function -__version__ = "0.9.3" +__version__ = "0.9.4"