RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-18 21:36:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Kefu Chai 2021-07-31 20:59:33 +08:00
parent 70f05e42a3
commit 90c4995c99
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
admin/build-doc
View File

@ -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,8 +51,9 @@ set -e
[ -z "$vdir" ] && vdir="$TOPDIR/build-doc/virtualenv"
if [ ! -e $vdir ]; then
virtualenv --python=python3 $vdir
python3 -m venv $vdir
$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

16
doc/start/documenting-ceph.rst
View File

@ -270,10 +270,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
@ -288,7 +288,6 @@ the following packages are required:
- gcc
- python-devel
- python-pip
- python-virtualenv
- python-docutils
- python-jinja2
- python-pygments
@ -307,7 +306,6 @@ the following packages are required:
- gcc
- python-devel
- python-pip
- python-virtualenv
- python-docutils
- python-jinja2
- python-pygments
@ -328,14 +326,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
@ -353,7 +351,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

3
doc_deps.deb.txt
View File

@ -2,8 +2,7 @@ git
gcc
python3-dev
python3-pip
python3-virtualenv
virtualenv
python3-venv
doxygen
ditaa
libxml2-dev