Skip to content
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.

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

chore(master): merge maint-0.9 #828

Merged
merged 4 commits into from
Sep 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ organisation on GitHub, in alphabetical order:
- [Kenyi Hurtado-Anampa](https://orcid.org/0000-0002-9779-3566)
- [Leticia Wanderley](https://orcid.org/0000-0003-4649-6630)
- [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)
- [Maria Fernando](https://github.com/MMFernando)
Expand Down
2 changes: 1 addition & 1 deletion helm/reana/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ keywords:
- reusable-science
type: application
version: 0.9.3
kubeVersion: '>= 1.21.0-0 < 1.31.0-0'
kubeVersion: '>= 1.21.0-0 < 1.32.0-0'
dependencies:
- name: traefik
version: 10.6.2
Expand Down
2 changes: 1 addition & 1 deletion reana/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
WORKFLOW_ENGINE_LIST_ALL = ["cwl", "serial", "yadage", "snakemake"]
"""List of supported workflow engines."""

COMPUTE_BACKEND_LIST_ALL = ["kubernetes", "htcondorcern", "slurmcern"]
COMPUTE_BACKEND_LIST_ALL = ["kubernetes", "htcondorcern", "slurmcern", "compute4punch"]
"""List of supported compute backends."""

CLUSTER_DEPLOYMENT_MODES = ["releasehelm", "releasepypi", "latest", "debug"]
Expand Down
4 changes: 2 additions & 2 deletions reana/reana_dev/cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ def add_volume_mounts(node):
"--build-arg",
"-b",
multiple=True,
help="Any build arguments? (e.g. `-b COMPUTE_BACKENDS=kubernetes,htcondorcern,slurmcern`)",
help="Any build arguments? (e.g. `-b COMPUTE_BACKENDS=kubernetes,htcondorcern,slurmcern,compute4punch`)",
)
@click.option(
"--mode",
Expand Down Expand Up @@ -219,7 +219,7 @@ def cluster_build(
\b
Example:
$ reana-dev cluster-build --exclude-components=r-ui,r-a-vomsproxy
-b COMPUTE_BACKENDS=kubernetes,htcondorcern,slurmcern
-b COMPUTE_BACKENDS=kubernetes,htcondorcern,slurmcern,compute4punch
--mode debug
--no-cache
"""
Expand Down
2 changes: 1 addition & 1 deletion reana/reana_dev/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) 2020, 2021, 2022, 2023 CERN.
# Copyright (C) 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
Loading