From 2bdf9078efb387eaf5c1fbe0a127c9316a534d2a Mon Sep 17 00:00:00 2001 From: Tommi Virtanen Date: Tue, 6 Dec 2011 12:13:03 -0800 Subject: [PATCH] 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 --- admin/build-doc | 6 +----- admin/doc-requirements.txt | 2 ++ 2 files changed, 3 insertions(+), 5 deletions(-) create mode 100644 admin/doc-requirements.txt diff --git a/admin/build-doc b/admin/build-doc index aff578e131a99..2c6d1a9468629 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 0000000000000..5ae6085073e00 --- /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 -- 2.39.5