From 48c58d9d9f3fc66e0ccbb2c67ecaac5892d83d9c Mon Sep 17 00:00:00 2001
From: Marco Donadoni <marco.donadoni@cern.ch>
Date: Tue, 26 Mar 2024 13:18:27 +0100
Subject: [PATCH] build(python): avoid using requirements.in (#448)

Pass the correct extras to `pip-compile` instead of duplicating
requirements in `requirements.in`.
---
 requirements.in  | 8 --------
 requirements.txt | 6 +++---
 setup.py         | 7 +++++--
 3 files changed, 8 insertions(+), 13 deletions(-)
 delete mode 100644 requirements.in

diff --git a/requirements.in b/requirements.in
deleted file mode 100644
index 1d153fd7..00000000
--- a/requirements.in
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file is part of REANA.
-# Copyright (C) 2020, 2023 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.
-
-paramiko[gssapi]==3.0.0
-gssapi==1.8.2 # matches version in Dockerfile
diff --git a/requirements.txt b/requirements.txt
index 4c089f7c..137c9dba 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile --annotation-style=line --output-file=requirements.txt requirements.in setup.py
+#    pip-compile --annotation-style=line --extra=ssh --output-file=requirements.txt setup.py
 #
 alembic==1.13.2           # via reana-db
 amqp==5.2.0               # via kombu
@@ -28,7 +28,7 @@ fqdn==1.5.1               # via jsonschema
 fs==2.4.16                # via reana-commons, reana-job-controller (setup.py)
 google-auth==2.32.0       # via kubernetes
 greenlet==3.0.3           # via sqlalchemy
-gssapi==1.8.2             # via -r requirements.in, paramiko
+gssapi==1.8.2             # via paramiko, reana-job-controller (setup.py)
 idna==3.7                 # via jsonschema, requests
 importlib-resources==6.4.0  # via swagger-spec-validator
 isoduration==20.11.0      # via jsonschema
@@ -48,7 +48,7 @@ monotonic==1.6            # via bravado
 msgpack==1.0.8            # via bravado-core
 msgpack-python==0.5.6     # via bravado
 oauthlib==3.2.2           # via requests-oauthlib
-paramiko[gssapi]==3.0.0   # via -r requirements.in
+paramiko[gssapi]==3.0.0   # via reana-job-controller (setup.py)
 psycopg2-binary==2.9.9    # via reana-db
 pyasn1==0.6.0             # via paramiko, pyasn1-modules, rsa
 pyasn1-modules==0.4.0     # via google-auth
diff --git a/setup.py b/setup.py
index b52c1132..7cde795e 100644
--- a/setup.py
+++ b/setup.py
@@ -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.
@@ -39,7 +39,10 @@
     "tests": [
         "pytest-reana>=0.95.0a2,<0.96.0",
     ],
-    "ssh": ["paramiko[gssapi]>=3.0.0"],
+    "ssh": [
+        "paramiko[gssapi]>=3.0.0",
+        "gssapi==1.8.2",  # matches version in Dockerfile
+    ],
 }
 
 # Python tests need SSH dependencies for imports