Skip to content

Commit

Permalink
build(python): avoid using requirements.in (reanahub#448)
Browse files Browse the repository at this point in the history
Pass the correct extras to `pip-compile` instead of duplicating
requirements in `requirements.in`.
  • Loading branch information
mdonadoni committed Mar 26, 2024
1 parent f4f955c commit be2ead9
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 15 deletions.
8 changes: 0 additions & 8 deletions requirements.in

This file was deleted.

10 changes: 5 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with Python 3.8
# 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.1 # via reana-db
amqp==5.2.0 # via kombu
Expand All @@ -26,7 +26,7 @@ decorator==5.1.1 # via gssapi
flask==2.1.3 # via reana-job-controller (setup.py)
fs==2.4.16 # via reana-commons, reana-job-controller (setup.py)
google-auth==2.28.1 # via kubernetes
gssapi==1.6.1 # via -r requirements.in, paramiko
gssapi==1.6.1 # via paramiko, reana-job-controller (setup.py)
idna==3.6 # via jsonschema, requests
importlib-metadata==7.0.1 # via alembic, flask
importlib-resources==6.1.2 # via alembic
Expand All @@ -45,7 +45,7 @@ monotonic==1.6 # via bravado
msgpack==1.0.7 # 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.5.1 # via paramiko, pyasn1-modules, rsa
pyasn1-modules==0.3.0 # via google-auth
Expand All @@ -55,8 +55,8 @@ pyrsistent==0.20.0 # via jsonschema
python-dateutil==2.9.0 # via bravado, bravado-core, kubernetes
pytz==2024.1 # via bravado-core
pyyaml==6.0.1 # via apispec, bravado, bravado-core, kubernetes, reana-commons, swagger-spec-validator
reana-commons[kubernetes]==0.95.0a2 # via reana-db, reana-job-controller (setup.py)
reana-db==0.95.0a2 # via reana-job-controller (setup.py)
reana-commons[kubernetes]==0.95.0a2 # via reana-db, reana-job-controller (setup.py)
reana-db==0.95.0a2 # via reana-job-controller (setup.py)
requests==2.31.0 # via bravado, bravado-core, kubernetes, requests-oauthlib
requests-oauthlib==1.3.1 # via kubernetes
retrying==1.3.4 # via reana-job-controller (setup.py)
Expand Down
7 changes: 5 additions & 2 deletions 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 Expand Up @@ -40,7 +40,10 @@
"htcondor==9.0.17",
],
"tests": tests_require,
"ssh": ["paramiko[gssapi]>=3.0.0"],
"ssh": [
"paramiko[gssapi]>=3.0.0",
"gssapi==1.6.1", # matches version in Dockerfile
],
}

# Python tests need SSH dependencies for imports
Expand Down

0 comments on commit be2ead9

Please sign in to comment.