summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@s-opensource.com>2017-07-17 18:46:38 -0300
committerJonathan Corbet <corbet@lwn.net>2017-07-23 15:51:24 -0600
commitfb947f3f472303d54759bf898cf92fd8c2dc9bdf (patch)
tree74d1935bf640c9b7ad868c433f03cdbd2b0eee8d
parent5be33182d4e22750237281f03172e6c3456cdb42 (diff)
sphinx-pre-install: use a requirements file
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> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
-rw-r--r--Documentation/sphinx/requirements.txt3
-rwxr-xr-xscripts/sphinx-pre-install5
2 files changed, 5 insertions, 3 deletions
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++;
}
}