Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-26 21:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

docs: sphinx-pre-install: don't require the RTD theme

Browse Source 
We don't default to the RTD theme anymore, so sphinx-pre-install need not
insist on installing it.

Acked-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
This commit is contained in:
Jonathan Corbet 2022-09-27 10:45:50 -06:00
parent 26d797ffc1
commit df19817f3f
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/sphinx/requirements.txt
View File

@ -1,4 +1,3 @@
# jinja2>=3.1 is not compatible with Sphinx<4.0 # jinja2>=3.1 is not compatible with Sphinx<4.0
jinja2<3.1 jinja2<3.1
sphinx_rtd_theme
Sphinx==2.4.4 Sphinx==2.4.4

8
scripts/sphinx-pre-install
View File

@ -362,7 +362,6 @@ sub give_debian_hints()
{ {
my %map = ( my %map = (
"python-sphinx" => "python3-sphinx", "python-sphinx" => "python3-sphinx",
"sphinx_rtd_theme" => "python3-sphinx-rtd-theme",
"ensurepip" => "python3-venv", "ensurepip" => "python3-venv",
"virtualenv" => "virtualenv", "virtualenv" => "virtualenv",
"dot" => "graphviz", "dot" => "graphviz",
@ -397,7 +396,6 @@ sub give_redhat_hints()
{ {
my %map = ( my %map = (
"python-sphinx" => "python3-sphinx", "python-sphinx" => "python3-sphinx",
"sphinx_rtd_theme" => "python3-sphinx_rtd_theme",
"virtualenv" => "python3-virtualenv", "virtualenv" => "python3-virtualenv",
"dot" => "graphviz", "dot" => "graphviz",
"convert" => "ImageMagick", "convert" => "ImageMagick",
@ -475,7 +473,6 @@ sub give_opensuse_hints()
{ {
my %map = ( my %map = (
"python-sphinx" => "python3-sphinx", "python-sphinx" => "python3-sphinx",
"sphinx_rtd_theme" => "python3-sphinx_rtd_theme",
"virtualenv" => "python3-virtualenv", "virtualenv" => "python3-virtualenv",
"dot" => "graphviz", "dot" => "graphviz",
"convert" => "ImageMagick", "convert" => "ImageMagick",
@ -523,7 +520,6 @@ sub give_mageia_hints()
{ {
my %map = ( my %map = (
"python-sphinx" => "python3-sphinx", "python-sphinx" => "python3-sphinx",
"sphinx_rtd_theme" => "python3-sphinx_rtd_theme",
"virtualenv" => "python3-virtualenv", "virtualenv" => "python3-virtualenv",
"dot" => "graphviz", "dot" => "graphviz",
"convert" => "ImageMagick", "convert" => "ImageMagick",
@ -567,7 +563,6 @@ sub give_mageia_hints()
sub give_arch_linux_hints() sub give_arch_linux_hints()
{ {
my %map = ( my %map = (
"sphinx_rtd_theme" => "python-sphinx_rtd_theme",
"virtualenv" => "python-virtualenv", "virtualenv" => "python-virtualenv",
"dot" => "graphviz", "dot" => "graphviz",
"convert" => "imagemagick", "convert" => "imagemagick",
@ -598,7 +593,6 @@ sub give_arch_linux_hints()
sub give_gentoo_hints() sub give_gentoo_hints()
{ {
my %map = ( my %map = (
"sphinx_rtd_theme" => "dev-python/sphinx_rtd_theme",
"virtualenv" => "dev-python/virtualenv", "virtualenv" => "dev-python/virtualenv",
"dot" => "media-gfx/graphviz", "dot" => "media-gfx/graphviz",
"convert" => "media-gfx/imagemagick", "convert" => "media-gfx/imagemagick",
@ -895,7 +889,6 @@ sub recommend_sphinx_version($)
$verbose_warn_install = 0; $verbose_warn_install = 0;
add_package("python-sphinx", 0); add_package("python-sphinx", 0);
check_python_module("sphinx_rtd_theme", 1);
check_distros(); check_distros();
@ -968,7 +961,6 @@ sub check_needs()
check_perl_module("Pod::Usage", 0); check_perl_module("Pod::Usage", 0);
check_program("make", 0); check_program("make", 0);
check_program("gcc", 0); check_program("gcc", 0);
check_python_module("sphinx_rtd_theme", 1) if (!$virtualenv);
check_program("dot", 1); check_program("dot", 1);
check_program("convert", 1); check_program("convert", 1);