Skip to content

Commit

Permalink
chore(master): merge maint-0.9 (#277)
Browse files Browse the repository at this point in the history
chore(maint-0.9): release 0.9.5 (#252)
build(python): bump shared REANA packages as of 2024-11-28 (#276)
build(docker): pin setuptools 70 (#274)
feat(externalbackend): allow Compute4PUNCH backend options (#269)

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.
  • Loading branch information
tiborsimko committed Dec 3, 2024
2 parents b9deced + 597461a commit d52e5bb
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "0.9.4"
".": "0.9.5"
}
1 change: 1 addition & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)


Expand Down
3 changes: 3 additions & 0 deletions reana_workflow_engine_yadage/externalbackend.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion setup.py
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

0 comments on commit d52e5bb

Please sign in to comment.