Skip to content

Commit

Permalink
chore(master): merge maint-0.9 (reanahub#219)
Browse files Browse the repository at this point in the history
chore(maint-0.9): release 0.9.4 (reanahub#193)
build(python): bump shared REANA packages as of 2024-11-28 (reanahub#218)
build(docker): pin setuptools 70 (reanahub#216)
feat(tasks): allow Compute4PUNCH backend options (reanahub#210)

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 00514b3 + 85748f5 commit e2b09bb
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 5 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.3"
".": "0.9.4"
}
1 change: 1 addition & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,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)
- [Rokas Maciulaitis](https://orcid.org/0000-0003-1064-6967)
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.4](https://github.com/reanahub/reana-workflow-engine-serial/compare/0.9.3...0.9.4) (2024-11-29)


### Build

* **docker:** pin setuptools 70 ([#216](https://github.com/reanahub/reana-workflow-engine-serial/issues/216)) ([f94d003](https://github.com/reanahub/reana-workflow-engine-serial/commit/f94d0036ded9562155528d52f33110e43c954384))
* **python:** bump shared REANA packages as of 2024-11-28 ([#218](https://github.com/reanahub/reana-workflow-engine-serial/issues/218)) ([430fd04](https://github.com/reanahub/reana-workflow-engine-serial/commit/430fd04acb6485754a0cc5fa4dbeefd3aaa022e4))


### Features

* **tasks:** allow Compute4PUNCH backend options ([#210](https://github.com/reanahub/reana-workflow-engine-serial/issues/210)) ([a6313f2](https://github.com/reanahub/reana-workflow-engine-serial/commit/a6313f22dcdcab08a84b3dd6c8ce7386122d7400))

## [0.9.3](https://github.com/reanahub/reana-workflow-engine-serial/compare/0.9.2...0.9.3) (2024-03-04)


Expand Down
5 changes: 4 additions & 1 deletion reana_workflow_engine_serial/tasks.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) 2018, 2019, 2020, 2021, 2022 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.
Expand Down Expand Up @@ -124,6 +124,9 @@ def run_step(
htcondor_accounting_group=step.get("htcondor_accounting_group", ""),
slurm_partition=step.get("slurm_partition"),
slurm_time=step.get("slurm_time"),
c4p_cpu_cores=step.get("c4p_cpu_cores"),
c4p_memory_limit=step.get("c4p_memory_limit"),
c4p_additional_requirements=step.get("c4p_additional_requirements"),
)
job_spec_copy = dict(job_spec)
job_spec_copy["cmd"] = command
Expand Down
8 changes: 7 additions & 1 deletion reana_workflow_engine_serial/utils.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) 2019, 2020, 2021, 2022 CERN.
# Copyright (C) 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 Expand Up @@ -36,6 +36,9 @@ def build_job_spec(
htcondor_accounting_group,
slurm_partition,
slurm_time,
c4p_cpu_cores,
c4p_memory_limit,
c4p_additional_requirements,
):
"""Build job specification to passed to RJC."""
job_spec = {
Expand All @@ -58,6 +61,9 @@ def build_job_spec(
"htcondor_accounting_group": htcondor_accounting_group,
"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 job_spec

Expand Down
2 changes: 1 addition & 1 deletion reana_workflow_engine_serial/version.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) 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.
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) 2018, 2019, 2020, 2021, 2022 CERN.
# Copyright (C) 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

0 comments on commit e2b09bb

Please sign in to comment.