From c2f490b8251ffcebcf53a72ac5f2bcc9ce0190b4 Mon Sep 17 00:00:00 2001
From: Manuel Giffels <giffels@gmail.com>
Date: Wed, 14 Feb 2024 16:14:07 +0100
Subject: [PATCH 1/3] feat(config): add Compute4PUNCH backend (#780)

---
 AUTHORS.md                 | 1 +
 reana/config.py            | 2 +-
 reana/reana_dev/cluster.py | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index a6681a54..4a1b3faf 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -35,6 +35,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)
diff --git a/reana/config.py b/reana/config.py
index eb9a8e12..951c9efa 100644
--- a/reana/config.py
+++ b/reana/config.py
@@ -131,7 +131,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"]
diff --git a/reana/reana_dev/cluster.py b/reana/reana_dev/cluster.py
index 98bd8c81..39fbf1b5 100644
--- a/reana/reana_dev/cluster.py
+++ b/reana/reana_dev/cluster.py
@@ -183,7 +183,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",
@@ -214,7 +214,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
     """

From be45c549c057ea2356b2f6688dd142c68ea11d44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tibor=20=C5=A0imko?= <tibor.simko@cern.ch>
Date: Thu, 29 Aug 2024 13:55:47 +0200
Subject: [PATCH 2/3] ci(python): pin setuptools 70 (#822)

Pin `setuptools` to the maximum version of 70 to allow working on Ubuntu
20.04 LTS based environments. (New versions of `setuptools` are not
compatible.)

Note that this fix is necessary only for the `maint-0.9` branches and
the REANA 0.9 release series. In `master` we have switched to Ubuntu
24.04 LTS based environments and Python 3.12 and no pinning is necessary
there.
---
 .github/workflows/ci.yml | 4 ++--
 reana/reana_dev/utils.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8238ee38..161b7aaa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -130,7 +130,7 @@ jobs:
 
       - name: Install Python dependencies
         run: |
-          pip install --upgrade pip setuptools py
+          pip install --upgrade pip 'setuptools<71' py
           pip install -e .[all]
 
       - name: Run Sphinx documentation with doctests
@@ -152,7 +152,7 @@ jobs:
 
       - name: Install Python dependencies
         run: |
-          pip install --upgrade pip setuptools py
+          pip install --upgrade pip 'setuptools<71' py
           pip install twine wheel
           pip install -e .[all]
 
diff --git a/reana/reana_dev/utils.py b/reana/reana_dev/utils.py
index 1ce74119..a72c1167 100644
--- a/reana/reana_dev/utils.py
+++ b/reana/reana_dev/utils.py
@@ -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.
@@ -605,7 +605,7 @@ def upgrade_requirements(component: str) -> bool:
 
     docker_cmd = (
         f"docker run --rm -it -v {get_srcdir(component)}:/code:z {PYTHON_DOCKER_IMAGE} "
-        f"bash -c 'cd /code && pip install --upgrade pip-tools setuptools pip && {pip_compile_cmd}'"
+        f"bash -c 'cd /code && pip install --upgrade pip-tools 'setuptools<71' pip && {pip_compile_cmd}'"
     )
     run_command(docker_cmd, component)
     return True

From 7da51d3be56b9bf03381c41342fb141cfb36b84b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tibor=20=C5=A0imko?= <tibor.simko@cern.ch>
Date: Fri, 16 Aug 2024 10:04:54 +0200
Subject: [PATCH 3/3] build(helm): add support for Kubernetes 1.31 (#822)

Declare support for Kubernetes 1.31 that was successfully tested locally
using Kind 0.24.
---
 helm/reana/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helm/reana/Chart.yaml b/helm/reana/Chart.yaml
index 668ac5ea..ed58383f 100644
--- a/helm/reana/Chart.yaml
+++ b/helm/reana/Chart.yaml
@@ -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