From 6c76fb28f7ceb9dcf29af7d1fa04edddedd52470 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sat, 1 Jun 2024 08:53:28 +0800 Subject: [PATCH] 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 --- ceph.spec.in | 1 - debian/ceph-mgr-modules-core.requires | 1 - src/pybind/mgr/requirements-required.txt | 1 - 3 files changed, 3 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 459bce9ea28d6..fae1e390ebab7 100644 --- 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 b5d37b3a9ce8c..eeeca20bcff5a 100644 --- 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 76fef65dbe430..a51b18696bd69 100644 --- 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 -- 2.39.5