ceph.spec.in: remove setuptools dependency

in 844b66de, we stopped using pkg_resources for import packaging.
and the exact reason why we introduced pkg_resources was for using
the packaging python module, see cf608920.

so, let's partially revert cf608920.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index 459bce9ea28d6d6d21f270623335a9d5c16d5c13..fae1e390ebab76303554088ced247cadcdb02e1f 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -672,7 +672,6 @@ Group:          System/Filesystems
 Requires:       ceph-mgr = %{_epoch_prefix}%{version}-%{release}
 Requires:       ceph-grafana-dashboards = %{_epoch_prefix}%{version}-%{release}
 Requires:       ceph-prometheus-alerts = %{_epoch_prefix}%{version}-%{release}
-Requires:       python%{python3_pkgversion}-setuptools
 %if 0%{?fedora} || 0%{?rhel} >= 9
 Requires:       python%{python3_pkgversion}-grpcio
 Requires:       python%{python3_pkgversion}-grpcio-tools

diff --git a/debian/ceph-mgr-modules-core.requires b/debian/ceph-mgr-modules-core.requires
index b5d37b3a9ce8c44b315f7e7d4679baa3fddc940a..eeeca20bcff5ad1999cee6c8645614a3ceb7e2e3 100644 (file)
--- a/debian/ceph-mgr-modules-core.requires
+++ b/debian/ceph-mgr-modules-core.requires
@@ -4,5 +4,4 @@ packaging
 pecan
 werkzeug
 requests
-pkg-resources
 python-dateutil

diff --git a/src/pybind/mgr/requirements-required.txt b/src/pybind/mgr/requirements-required.txt
index 76fef65dbe430dd49bc18091f06839ebcb32c3da..a51b18696bd69469ac506e6d88ad40ce05d257cc 100644 (file)
--- a/src/pybind/mgr/requirements-required.txt
+++ b/src/pybind/mgr/requirements-required.txt
@@ -12,7 +12,6 @@ pytest-cov==2.7.1
 pyyaml
 requests-mock
 scipy
-setuptools
 werkzeug
 natsort
 bcrypt