From: Kefu Chai <kchai@redhat.com>
Date: Sat, 31 Jul 2021 13:15:48 +0000 (+0800)
Subject: rpm, debian: drop virtualenv from build deps
X-Git-Tag: v16.2.7~120^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F43002%2Fhead;p=ceph.git

rpm, debian: drop virtualenv from build deps

since we've replaced "virtualenv" with "python3 -m venv", there is no
need to have it in the build deps list.

since, on ubuntu, venv modules is not available by default, we need to
install python3-venv.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 3741f57eeed2fac7170900277c1d4bd8737d9f31)

 Conflicts:
	debian/control - trivial ordering

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 1496ef238211a..b8f8bf1965c49 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -236,7 +236,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}-virtualenv
 BuildRequires:	python%{python3_pkgversion}-coverage
 BuildRequires:	python%{python3_pkgversion}-pyOpenSSL
 BuildRequires:	socat
diff --git a/debian/control b/debian/control
index b3b48950ad781..f251e19395a20 100644
--- a/debian/control
+++ b/debian/control
@@ -99,13 +99,13 @@ Build-Depends: automake,
                python3-sphinx,
 # Make-Check   python3-werkzeug,
                python3-setuptools,
+               python3-venv,
 # Crimson      ragel,
 # Make-Check   socat,
 # Crimson      systemtap-sdt-dev,
 # Make-Check   uuid-dev,
                uuid-runtime,
                valgrind,
-               virtualenv,
                xfslibs-dev,
 # Make-Check   xfsprogs,
 # Make-Check   xmlstarlet,