From: Mauro Carvalho Chehab <mchehab@s-opensource.com>
To: Linux Doc Mailing List <linux-doc@vger.kernel.org>
Cc: Mauro Carvalho Chehab <mchehab@s-opensource.com>,
Mauro Carvalho Chehab <mchehab@infradead.org>,
linux-kernel@vger.kernel.org, Jonathan Corbet <corbet@lwn.net>
Subject: [PATCH v2 4/8] sphinx-pre-install: use a requirements file
Date: Mon, 17 Jul 2017 18:46:38 -0300 [thread overview]
Message-ID: <d70b98dfde23892476f8d878c305e6ac4dce3fbc.1500327282.git.mchehab@s-opensource.com> (raw)
In-Reply-To: <cover.1500327282.git.mchehab@s-opensource.com>
In-Reply-To: <cover.1500327282.git.mchehab@s-opensource.com>
Instead of using 3 commands to install a virtualenv, use
a single one, reading the requirements from this file:
Documentation/sphinx/requirements.txt
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
---
Documentation/sphinx/requirements.txt | 3 +++
scripts/sphinx-pre-install | 5 ++---
2 files changed, 5 insertions(+), 3 deletions(-)
create mode 100644 Documentation/sphinx/requirements.txt
diff --git a/Documentation/sphinx/requirements.txt b/Documentation/sphinx/requirements.txt
new file mode 100644
index 000000000000..742be3e12619
--- /dev/null
+++ b/Documentation/sphinx/requirements.txt
@@ -0,0 +1,3 @@
+docutils==0.12
+Sphinx==1.4.9
+sphinx_rtd_theme
diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
index bcd6f7978f8d..230d9cc7ee1d 100755
--- a/scripts/sphinx-pre-install
+++ b/scripts/sphinx-pre-install
@@ -14,6 +14,7 @@ use strict;
# GNU General Public License for more details.
my $virtenv_dir = "sphinx_1.4";
+my $requirement_file = "Documentation/sphinx/requirements.txt";
#
# Static vars
@@ -467,9 +468,7 @@ sub check_needs()
printf "\t$virtualenv $virtenv_dir\n";
printf "\t. $activate\n";
- printf "\tpip install 'docutils==0.12'\n";
- printf "\tpip install 'Sphinx==1.4.9'\n";
- printf "\tpip install sphinx_rtd_theme\n";
+ printf "\tpip install -r $requirement_file\n";
$need++;
}
}
--
2.13.3
next prev parent reply other threads:[~2017-07-17 21:46 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-17 21:46 [PATCH v2 0/8] Add a script to check for Sphinx install requirements Mauro Carvalho Chehab
2017-07-17 21:46 ` [PATCH v2 1/8] docs: Makefile: remove no-ops targets Mauro Carvalho Chehab
2017-07-17 21:46 ` [PATCH v2 2/8] scripts/sphinx-pre-install: add a script to check Sphinx install Mauro Carvalho Chehab
2017-07-17 21:46 ` [PATCH v2 3/8] sphinx-pre-install: detect an existing virtualenv Mauro Carvalho Chehab
2017-07-17 21:46 ` Mauro Carvalho Chehab [this message]
2017-07-17 21:46 ` [PATCH v2 5/8] sphinx-pre-install: check for the need of graphviz-gd Mauro Carvalho Chehab
2017-07-17 21:46 ` [PATCH v2 6/8] sphinx-pre-install: add dependencies for ImageMagick to work with svg Mauro Carvalho Chehab
2017-07-17 21:46 ` [PATCH v2 7/8] sphinx-pre-install: fix USE needs for GraphViz and ImageMagick Mauro Carvalho Chehab
2017-07-17 21:46 ` [PATCH v2 8/8] sphinx.rst: document scripts/sphinx-pre-install script Mauro Carvalho Chehab
2017-07-23 22:08 ` [PATCH v2 0/8] Add a script to check for Sphinx install requirements Jonathan Corbet
2017-07-23 23:01 ` Mauro Carvalho Chehab
2017-07-24 12:11 ` Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d70b98dfde23892476f8d878c305e6ac4dce3fbc.1500327282.git.mchehab@s-opensource.com \
--to=mchehab@s-opensource.com \
--cc=corbet@lwn.net \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®