admin/build-doc: s/virtualenv/python3 -m venv/

so we don't need to use virtualenv python package for creating a
virtualenv, the "venv" module in Python3 would suffice.

see also https://docs.python.org/3/library/venv.html

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

 Conflicts:
	admin/build-doc

Cherry-pick notes:
- admin/build-doc always pip-install's requirements (lacking 144bf1a73
  from master)

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

diff --git a/admin/build-doc b/admin/build-doc
index bb2a46282c8b31c628a3a1dd71f7b270e8b99adf..345324a140971e19c9b1f511828ecabad48301f0 100755 (executable)
--- a/admin/build-doc
+++ b/admin/build-doc
@@ -20,7 +20,7 @@ if command -v dpkg >/dev/null; then
         exit 1
     fi
 elif command -v yum >/dev/null; then
-    for package in ant ditaa doxygen libxslt-devel libxml2-devel graphviz python3-devel python3-pip python3-virtualenv python3-Cython; do
+    for package in ant ditaa doxygen libxslt-devel libxml2-devel graphviz python3-devel python3-pip python3-Cython; do
        if ! rpm -q --whatprovides $package >/dev/null ; then
                missing="${missing:+$missing }$package"
        fi
@@ -31,7 +31,7 @@ elif command -v yum >/dev/null; then
         exit 1
     fi
 else
-    for command in dot virtualenv doxygen ant ditaa cython; do
+    for command in dot doxygen ant ditaa cython; do
         if ! command -v "$command" > /dev/null; then
             # add a space after old values
             missing="${missing:+$missing }$command"
@@ -51,9 +51,10 @@ set -e
 [ -z "$vdir" ] && vdir="$TOPDIR/build-doc/virtualenv"
 
 if [ ! -e $vdir ]; then
-    virtualenv --python=python3 $vdir
+    python3 -m venv $vdir
 fi
 
+$vdir/bin/pip install --quiet wheel
 $vdir/bin/pip install --quiet \
               -r $TOPDIR/admin/doc-requirements.txt \
               -r $TOPDIR/admin/doc-python-common-requirements.txt

diff --git a/doc/start/documenting-ceph.rst b/doc/start/documenting-ceph.rst
index fa528a647375bf20699da49db611f90715643954..735a20df35242d1ff26c915fd2eb55824fd8909a 100644 (file)
--- a/doc/start/documenting-ceph.rst
+++ b/doc/start/documenting-ceph.rst
@@ -271,10 +271,10 @@ the following packages are required:
        <table cellpadding="10"><colgroup><col width="30%"><col width="30%"><col width="30%"></colgroup><tbody valign="top"><tr><td><h3>Debian/Ubuntu</h3>
 
 - gcc
-- python-dev
-- python-pip
-- python-virtualenv
-- python-sphinx
+- python3-dev
+- python3-pip
+- python3-sphinx
+- pytnon3-venv
 - libxml2-dev
 - libxslt1-dev
 - doxygen
@@ -289,7 +289,6 @@ the following packages are required:
 - gcc
 - python-devel
 - python-pip
-- python-virtualenv
 - python-docutils
 - python-jinja2
 - python-pygments
@@ -308,7 +307,6 @@ the following packages are required:
 - gcc
 - python-devel
 - python-pip
-- python-virtualenv
 - python-docutils
 - python-jinja2
 - python-pygments
@@ -329,14 +327,14 @@ distributions, execute the following:
 
 .. prompt:: bash $
 
-       sudo apt-get install gcc python-dev python-pip python-virtualenv libxml2-dev libxslt-dev doxygen graphviz ant ditaa
+       sudo apt-get install gcc python-dev python-pip libxml2-dev libxslt-dev doxygen graphviz ant ditaa
        sudo apt-get install python-sphinx
 
 For Fedora distributions, execute the following:
 
 .. prompt:: bash $
 
-   sudo yum install gcc python-devel python-pip python-virtualenv libxml2-devel libxslt-devel doxygen graphviz ant
+   sudo yum install gcc python-devel python-pip libxml2-devel libxslt-devel doxygen graphviz ant
    sudo pip install html2text
    sudo yum install python-jinja2 python-pygments python-docutils python-sphinx
    sudo yum install jericho-html ditaa
@@ -354,7 +352,7 @@ For CentOS/RHEL distributions, execute the following:
 
 .. prompt:: bash $
 
-       sudo yum install gcc python-devel python-pip python-virtualenv libxml2-devel libxslt-devel doxygen graphviz ant
+       sudo yum install gcc python-devel python-pip libxml2-devel libxslt-devel doxygen graphviz ant
        sudo pip install html2text
 
 For CentOS/RHEL distributions, the remaining python packages are not available

diff --git a/doc_deps.deb.txt b/doc_deps.deb.txt
index 4bfff0f205be30e249db2b968e9cac9ebe0da6eb..e2eb80a2f4047468fc064d917a1901e9aa924ec8 100644 (file)
--- a/doc_deps.deb.txt
+++ b/doc_deps.deb.txt
@@ -2,8 +2,7 @@ git
 gcc
 python3-dev
 python3-pip
-python3-virtualenv
-virtualenv
+python3-venv
 doxygen
 ditaa
 libxml2-dev