Merge pull request #30420 from runsisi/wip-remove-requests

rpm,deb: python-requests is not needed for ceph-common

Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2019-09-25 16:31:13 +08:00 committed by GitHub
commit b43cbefc05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions

View File

@ -364,7 +364,6 @@ Requires: grep
Requires: logrotate
Requires: parted
Requires: psmisc
Requires: python%{_python_buildid}-requests
Requires: python%{_python_buildid}-setuptools
Requires: util-linux
Requires: xfsprogs
@ -396,7 +395,6 @@ Requires: python%{_python_buildid}-cephfs = %{_epoch_prefix}%{version}-%{release
Requires: python%{_python_buildid}-rgw = %{_epoch_prefix}%{version}-%{release}
Requires: python%{_python_buildid}-ceph-argparse = %{_epoch_prefix}%{version}-%{release}
Requires: python%{_python_buildid}-ceph-common = %{_epoch_prefix}%{version}-%{release}
Requires: python%{_python_buildid}-requests
%if 0%{?fedora} || 0%{?rhel}
Requires: python%{_python_buildid}-prettytable
%endif
@ -446,6 +444,7 @@ Group: System/Filesystems
Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
Requires: python%{_python_buildid}-bcrypt
Requires: python%{_python_buildid}-pecan
Requires: python%{_python_buildid}-requests
Requires: python%{_python_buildid}-six
%if 0%{?fedora} || 0%{?rhel}
Requires: python%{_python_buildid}-cherrypy

4
debian/control vendored
View File

@ -199,11 +199,12 @@ Description: debugging symbols for ceph-mds
Package: ceph-mgr
Architecture: linux-any
Depends: ceph-base (= ${binary:Version}),
python-bcrypt,
python-cherrypy3,
python-jwt,
python-openssl,
python-pecan,
python-bcrypt,
python-requests,
python-werkzeug,
${misc:Depends},
${python:Depends},
@ -554,7 +555,6 @@ Depends: librbd1 (= ${binary:Version}),
python-prettytable,
python-rados (= ${binary:Version}),
python-rbd (= ${binary:Version}),
python-requests,
python-rgw (= ${binary:Version}),
${misc:Depends},
${python:Depends},