From 0d82529630e6aa72337fb34ad6dcd5eca55bd906 Mon Sep 17 00:00:00 2001 From: Haibo Lin Date: Sep 29 2022 07:54:59 +0000 Subject: Replace requests-kerberos with requests-gssapi requests-kerberos is deprecated since RHEL 7.5 and requests-gssapi is a drop-in replacement. Signed-off-by: Haibo Lin --- diff --git a/Dockerfile b/Dockerfile index 784fabb..b797056 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,7 +41,7 @@ RUN dnf -y --setopt=install_weak_deps=False update \ python3-psycopg2 \ python3-pyOpenSSL \ python3-requests \ - python3-requests-kerberos \ + python3-requests-gssapi \ python3-six \ python3-sqlalchemy \ python3-systemd \ diff --git a/client/odcs/client/odcs.py b/client/odcs/client/odcs.py index d94c84b..73eaf1c 100644 --- a/client/odcs/client/odcs.py +++ b/client/odcs/client/odcs.py @@ -27,7 +27,7 @@ import requests import time from six.moves import urllib_parse -from requests_kerberos import HTTPKerberosAuth, OPTIONAL +from requests_gssapi import HTTPKerberosAuth, OPTIONAL class AuthMech(object): diff --git a/client/requirements.txt b/client/requirements.txt index 3a4728b..0561dc0 100644 --- a/client/requirements.txt +++ b/client/requirements.txt @@ -1,5 +1,5 @@ pyOpenSSL # qpid-python # Python2 only; not necessary; just to hide warning messages six -requests-kerberos +requests-gssapi requests diff --git a/tox.ini b/tox.ini index e0d101c..66b4963 100644 --- a/tox.ini +++ b/tox.ini @@ -21,7 +21,7 @@ sitepackages = true [testenv:py27] commands = - pip install pytest pytest-cov mock requests requests_kerberos + pip install pytest pytest-cov mock requests requests-gssapi py.test \ -W "ignore:inspect.getargspec:DeprecationWarning" \ client/tests/ \