From: Kefu Chai <kchai@redhat.com>
Date: Sun, 19 Jul 2020 09:45:58 +0000 (+0800)
Subject: rpm,deb: drop python3-six dependency
X-Git-Tag: v16.1.0~1654^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3902a5eede5722c9206d6458936dcdb4c351227f;p=ceph.git

rpm,deb: drop python3-six dependency

it's not used anymore.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 9f95c16c88b0..ea1238f1f0b3 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -187,7 +187,6 @@ BuildRequires:	python%{python3_pkgversion}-nose
 BuildRequires:	python%{python3_pkgversion}-pecan
 BuildRequires:	python%{python3_pkgversion}-requests
 BuildRequires:	python%{python3_pkgversion}-dateutil
-BuildRequires:	python%{python3_pkgversion}-six
 BuildRequires:	python%{python3_pkgversion}-virtualenv
 BuildRequires:	python%{python3_pkgversion}-coverage
 BuildRequires:	python%{python3_pkgversion}-pyOpenSSL
@@ -446,7 +445,6 @@ Group:          System/Filesystems
 %endif
 Requires:       ceph-base = %{_epoch_prefix}%{version}-%{release}
 Requires:       ceph-mgr-modules-core = %{_epoch_prefix}%{version}-%{release}
-Requires:       python%{python3_pkgversion}-six
 %if 0%{?weak_deps}
 Recommends:	ceph-mgr-dashboard = %{_epoch_prefix}%{version}-%{release}
 Recommends:	ceph-mgr-diskprediction-local = %{_epoch_prefix}%{version}-%{release}
diff --git a/debian/control b/debian/control
index fef1f8e1a2cc..d83f8425b8e2 100644
--- a/debian/control
+++ b/debian/control
@@ -75,7 +75,6 @@ Build-Depends: cmake (>= 3.10.2),
 # Make-Check   python3-nose,
 # Make-Check   python3-pecan,
 # Make-Check   python3-bcrypt,
-# Make-Check   python3-six,
 # Make-Check   tox,
 # Make-Check   python3-coverage,
 # Make-Check   python3-dateutil,
@@ -315,7 +314,6 @@ Description: ceph manager modules which are always enabled
 Package: ceph-mgr-rook
 Architecture: all
 Depends: ceph-mgr (= ${binary:Version}),
-         python3-six,
          python3-jsonpatch
          ${misc:Depends},
          ${python:Depends},
@@ -348,7 +346,6 @@ Package: ceph-mgr-cephadm
 Architecture: all
 Depends: ceph-mgr (= ${binary:Version}),
 	 cephadm,
-	 python3-six,
          ${misc:Depends},
          ${python:Depends},
          openssh-client,