diff options
| author | Tommi Virtanen <tommi.virtanen@dreamhost.com> | 2011-12-06 21:13:03 +0100 |
|---|---|---|
| committer | Tommi Virtanen <tommi.virtanen@dreamhost.com> | 2011-12-06 21:13:03 +0100 |
| commit | 2bdf9078efb387eaf5c1fbe0a127c9316a534d2a (patch) | |
| tree | 8bba7c51a3aac73e84f6aa03b09ec6f592bf0673 /admin | |
| parent | doc: Switch diagram tools from dia to ditaa. (diff) | |
| download | ceph-2bdf9078efb387eaf5c1fbe0a127c9316a534d2a.tar.xz ceph-2bdf9078efb387eaf5c1fbe0a127c9316a534d2a.zip | |
doc: Reorganize pip calls to use a requirements file.
The conditional before running pip install was unnecessary,
"pip install" on already installed packages is fast (as long
as it's not --upgrade), and --quiet makes it not spam the
console.
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
Diffstat (limited to 'admin')
| -rwxr-xr-x | admin/build-doc | 6 | ||||
| -rw-r--r-- | admin/doc-requirements.txt | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/admin/build-doc b/admin/build-doc index aff578e131a..2c6d1a94686 100755 --- a/admin/build-doc +++ b/admin/build-doc @@ -42,9 +42,7 @@ cd build-doc if [ ! -e virtualenv ]; then virtualenv --no-site-packages virtualenv fi -if [ ! -x virtualenv/bin/sphinx-build ]; then - ./virtualenv/bin/pip install sphinx -fi +./virtualenv/bin/pip install --quiet -r ../admin/doc-requirements.txt # ugly kludge until breathe is distutils-friendly install -d breathe @@ -57,8 +55,6 @@ if [ -z "$(git rev-parse --default HEAD)" ]; then fi cd .. -./virtualenv/bin/pip install --quiet -e 'git+https://github.com/NewDreamNetwork/sphinx-ditaa.git#egg=sphinx-ditaa' - install -d -m0755 \ output/html \ output/man diff --git a/admin/doc-requirements.txt b/admin/doc-requirements.txt new file mode 100644 index 00000000000..5ae6085073e --- /dev/null +++ b/admin/doc-requirements.txt @@ -0,0 +1,2 @@ +Sphinx >=1.1.2 +-e git+https://github.com/NewDreamNetwork/sphinx-ditaa.git#egg=sphinx-ditaa |