Extend commit 84b4cc8189f2 ("docs: scripts: sphinx-pre-install: Fix building docs with pyyaml package") and add pyyaml as an optional package to Mageia, ArchLinux, and Gentoo. The Python module pyyaml is required to build the docs, but it is only listed in Documentation/sphinx/requirements.txt and is therefore missing when Sphinx is installed as a package and not via pip/pypi.
Showing the changes to scripts (1 of 1 file). Show all
Unified · Split
| @@ -514,6 +514,7 @@ sub give_mageia_hints() · 513 unmodified lines | |||
| 514 | { | 514 | { |
| 515 | my %map = ( | 515 | my %map = ( |
| 516 | "python-sphinx" => "python3-sphinx", | 516 | "python-sphinx" => "python3-sphinx", |
| 517 | "yaml" => "python3-yaml", | ||
| 517 | "virtualenv" => "python3-virtualenv", | 518 | "virtualenv" => "python3-virtualenv", |
| 518 | "dot" => "graphviz", | 519 | "dot" => "graphviz", |
| 519 | "convert" => "ImageMagick", | 520 | "convert" => "ImageMagick", |
| @@ -557,6 +558,7 @@ sub give_mageia_hints() · 37 unmodified lines | |||
| 557 | sub give_arch_linux_hints() | 558 | sub give_arch_linux_hints() |
| 558 | { | 559 | { |
| 559 | my %map = ( | 560 | my %map = ( |
| 561 | "yaml" => "python-yaml", | ||
| 560 | "virtualenv" => "python-virtualenv", | 562 | "virtualenv" => "python-virtualenv", |
| 561 | "dot" => "graphviz", | 563 | "dot" => "graphviz", |
| 562 | "convert" => "imagemagick", | 564 | "convert" => "imagemagick", |
| @@ -587,6 +589,7 @@ sub give_arch_linux_hints() · 24 unmodified lines | |||
| 587 | sub give_gentoo_hints() | 589 | sub give_gentoo_hints() |
| 588 | { | 590 | { |
| 589 | my %map = ( | 591 | my %map = ( |
| 592 | "yaml" => "dev-python/pyyaml", | ||
| 590 | "virtualenv" => "dev-python/virtualenv", | 593 | "virtualenv" => "dev-python/virtualenv", |
| 591 | "dot" => "media-gfx/graphviz", | 594 | "dot" => "media-gfx/graphviz", |
| 592 | "convert" => "media-gfx/imagemagick", | 595 | "convert" => "media-gfx/imagemagick", |