From c1ea66fe12f86e7a63681cba860fb91b1ea86e12 Mon Sep 17 00:00:00 2001 From: Daniel Persson Date: Sun, 3 Dec 2023 08:03:47 +0000 Subject: [PATCH] mgr/dashboard: Changes suggested after review by @epuertat. Move the JWT requirement to the test requirements file. Also remove JWT from ceph specification and debian build. Signed-off-by: Daniel Persson --- ceph.spec.in | 4 ---- debian/control | 1 - src/pybind/mgr/dashboard/requirements-test.txt | 1 + src/pybind/mgr/dashboard/tox.ini | 1 - 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 3807f48280e95..9aa2432dcd480 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -414,7 +414,6 @@ BuildRequires: xmlsec1-nss BuildRequires: xmlsec1-openssl BuildRequires: xmlsec1-openssl-devel BuildRequires: python%{python3_pkgversion}-cherrypy -BuildRequires: python%{python3_pkgversion}-jwt BuildRequires: python%{python3_pkgversion}-routes BuildRequires: python%{python3_pkgversion}-scipy BuildRequires: python%{python3_pkgversion}-werkzeug @@ -427,7 +426,6 @@ BuildRequires: libxmlsec1-1 BuildRequires: libxmlsec1-nss1 BuildRequires: libxmlsec1-openssl1 BuildRequires: python%{python3_pkgversion}-CherryPy -BuildRequires: python%{python3_pkgversion}-PyJWT BuildRequires: python%{python3_pkgversion}-Routes BuildRequires: python%{python3_pkgversion}-Werkzeug BuildRequires: python%{python3_pkgversion}-numpy-devel @@ -629,7 +627,6 @@ Requires: ceph-prometheus-alerts = %{_epoch_prefix}%{version}-%{release} Requires: python%{python3_pkgversion}-setuptools %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} Requires: python%{python3_pkgversion}-cherrypy -Requires: python%{python3_pkgversion}-jwt Requires: python%{python3_pkgversion}-routes Requires: python%{python3_pkgversion}-werkzeug %if 0%{?weak_deps} @@ -638,7 +635,6 @@ Recommends: python%{python3_pkgversion}-saml %endif %if 0%{?suse_version} Requires: python%{python3_pkgversion}-CherryPy -Requires: python%{python3_pkgversion}-PyJWT Requires: python%{python3_pkgversion}-Routes Requires: python%{python3_pkgversion}-Werkzeug Recommends: python%{python3_pkgversion}-python3-saml diff --git a/debian/control b/debian/control index 5ae413ce774ab..f1bdec95a2efd 100644 --- a/debian/control +++ b/debian/control @@ -91,7 +91,6 @@ Build-Depends: automake, python3-all-dev, python3-cherrypy3, python3-natsort, - python3-jwt , python3-pecan , python3-bcrypt , tox , diff --git a/src/pybind/mgr/dashboard/requirements-test.txt b/src/pybind/mgr/dashboard/requirements-test.txt index da283d0b64aaa..aa80b3336b540 100644 --- a/src/pybind/mgr/dashboard/requirements-test.txt +++ b/src/pybind/mgr/dashboard/requirements-test.txt @@ -2,3 +2,4 @@ pytest-cov pytest-instafail pyfakefs==4.5.0 jsonschema~=4.0 +PyJWT~=2.0 diff --git a/src/pybind/mgr/dashboard/tox.ini b/src/pybind/mgr/dashboard/tox.ini index 271df286ec5e8..47756e946e125 100644 --- a/src/pybind/mgr/dashboard/tox.ini +++ b/src/pybind/mgr/dashboard/tox.ini @@ -20,7 +20,6 @@ addopts = deps = -rrequirements.txt -cconstraints.txt - PyJWT [base-test] deps = -- 2.39.5