Skip to content

chore(master): merge maint-0.9 #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tiborsimko merged 5 commits into from
Jan 15, 2025
+23 −3
Merged

chore(master): merge maint-0.9 #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9b2a3d0
feat(task): allow Compute4PUNCH backend options (#277)
giffels Jul 1, 2024
3c2cd8a
build(docker): pin setuptools 70 (#287)
tiborsimko Sep 2, 2024
f9d3688
build(python): bump shared REANA packages as of 2024-11-28 (#289)
mdonadoni Nov 28, 2024
3efaadd
chore(maint-0.9): release 0.9.4
github-actions[bot] Nov 29, 2024
01af8ef
chore(master): merge maint-0.9 (#290)
tiborsimko Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .release-please-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "0.9.3"
".": "0.9.4"
}
1 change: 1 addition & 0 deletions AUTHORS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)


Expand Down
6 changes: 6 additions & 0 deletions reana_workflow_engine_cwl/cwl_reana.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,9 @@
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")

Check warning on line 275 in reana_workflow_engine_cwl/cwl_reana.py

View check run for this annotation

Codecov / codecov/patch

reana_workflow_engine_cwl/cwl_reana.py#L273-L275 

Added lines #L273 - L275 were not covered by tests
create_body = {
"image": container,
"cmd": wrapped_cmd,
Expand All @@ -290,6 +293,9 @@
"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
Expand Down
2 changes: 1 addition & 1 deletion reana_workflow_engine_cwl/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
# 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.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
# This file is part of REANA.
# Copyright (C) 2017, 2018, 2019, 2020, 2021, 2022 CERN.
# Copyright (C) 2017, 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.
Expand Down
Loading