Skip to content

Commit 01af8ef

Browse files
committed
chore(master): merge maint-0.9 (#290)
chore(maint-0.9): release 0.9.4 (#257) build(python): bump shared REANA packages as of 2024-11-28 (#289) build(docker): pin setuptools 70 (#287) feat(task): allow Compute4PUNCH backend options (#277) Note: The merge commit removes the changes related to pinning `setuptools` to version 70, because this was only necessary for the `maint-0.9` branches, as well as other 0.9.4 release-related changes.
2 parents 9fe826b + 3efaadd commit 01af8ef

File tree

6 files changed

+23
-3
lines changed

6 files changed

+23
-3
lines changed

.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "0.9.3"
2+
".": "0.9.4"
33
}

AUTHORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ The list of contributors in alphabetical order:
1313
- [Dinos Kousidis](https://orcid.org/0000-0002-4914-4289)
1414
- [Giuseppe Steduto](https://orcid.org/0009-0002-1258-8553)
1515
- [Jan Okraska](https://orcid.org/0000-0002-1416-3244)
16+
- [Manuel Giffels](https://orcid.org/0000-0003-0193-3032)
1617
- [Marco Donadoni](https://orcid.org/0000-0003-2922-5505)
1718
- [Marco Vidal](https://orcid.org/0000-0002-9363-4971)
1819
- [Michael R. Crusoe](https://orcid.org/0000-0002-2961-9670)

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Changelog
22

3+
## [0.9.4](https://github.com/reanahub/reana-workflow-engine-cwl/compare/0.9.3...0.9.4) (2024-11-29)
4+
5+
6+
### Build
7+
8+
* **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))
9+
* **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))
10+
11+
12+
### Features
13+
14+
* **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))
15+
316
## [0.9.3](https://github.com/reanahub/reana-workflow-engine-cwl/compare/0.9.2...0.9.3) (2024-03-04)
417

518

reana_workflow_engine_cwl/cwl_reana.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,9 @@ def shouldquote(x):
270270
kubernetes_uid = self._get_hint("kubernetes_uid")
271271
kubernetes_memory_limit = self._get_hint("kubernetes_memory_limit")
272272
kubernetes_job_timeout = self._get_hint("kubernetes_job_timeout")
273+
c4p_cpu_cores = self._get_hint("c4p_cpu_cores")
274+
c4p_memory_limit = self._get_hint("c4p_memory_limit")
275+
c4p_additional_requirements = self._get_hint("c4p_additional_requirements")
273276
create_body = {
274277
"image": container,
275278
"cmd": wrapped_cmd,
@@ -290,6 +293,9 @@ def shouldquote(x):
290293
"kubernetes_job_timeout": kubernetes_job_timeout,
291294
"slurm_partition": slurm_partition,
292295
"slurm_time": slurm_time,
296+
"c4p_cpu_cores": c4p_cpu_cores,
297+
"c4p_memory_limit": c4p_memory_limit,
298+
"c4p_additional_requirements": c4p_additional_requirements,
293299
}
294300

295301
return create_body

reana_workflow_engine_cwl/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
22
#
33
# This file is part of REANA.
4-
# Copyright (C) 2017, 2018, 2019, 2020, 2021, 2022, 2023 CERN.
4+
# Copyright (C) 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024 CERN.
55
#
66
# REANA is free software; you can redistribute it and/or modify it
77
# under the terms of the MIT License; see LICENSE file for more details.

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
22
#
33
# This file is part of REANA.
4-
# Copyright (C) 2017, 2018, 2019, 2020, 2021, 2022 CERN.
4+
# Copyright (C) 2017, 2018, 2019, 2020, 2021, 2022, 2024 CERN.
55
#
66
# REANA is free software; you can redistribute it and/or modify it
77
# under the terms of the MIT License; see LICENSE file for more details.

0 commit comments

Comments
 (0)