diff --git a/ceph.spec.in b/ceph.spec.in index 151f332ff1dd4..459bce9ea28d6 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -723,6 +723,7 @@ BuildArch: noarch Group: System/Filesystems %endif Requires: python%{python3_pkgversion}-bcrypt +Requires: python%{python3_pkgversion}-packaging Requires: python%{python3_pkgversion}-pecan Requires: python%{python3_pkgversion}-pyOpenSSL Requires: python%{python3_pkgversion}-requests diff --git a/debian/ceph-mgr-modules-core.requires b/debian/ceph-mgr-modules-core.requires index 9814e67b7108c..b5d37b3a9ce8c 100644 --- a/debian/ceph-mgr-modules-core.requires +++ b/debian/ceph-mgr-modules-core.requires @@ -1,5 +1,6 @@ natsort CherryPy +packaging pecan werkzeug requests diff --git a/src/pybind/mgr/prometheus/module.py b/src/pybind/mgr/prometheus/module.py index 45a6c9f001370..6f675e3be0038 100644 --- a/src/pybind/mgr/prometheus/module.py +++ b/src/pybind/mgr/prometheus/module.py @@ -1,7 +1,6 @@ import cherrypy import yaml from collections import defaultdict -from pkg_resources import packaging # type: ignore import json import math import os @@ -9,6 +8,7 @@ import threading import time import enum +from packaging import version # type: ignore from collections import namedtuple from mgr_module import CLIReadCommand, MgrModule, MgrStandbyModule, PG_STATES, Option, ServiceInfoT, HandleCommandResult, CLIWriteCommand @@ -34,7 +34,7 @@ # ipv6 isn't yet configured / supported and CherryPy throws an uncaught # exception. if cherrypy is not None: - Version = packaging.version.Version + Version = version.Version v = Version(cherrypy.__version__) # the issue was fixed in 3.2.3. it's present in 3.2.2 (current version on # centos:7) and back to at least 3.0.0.