[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 5/6] meson: prefer 'sphinx-build' to 'sphinx-build-3'
From: |
John Snow |
Subject: |
[PATCH v3 5/6] meson: prefer 'sphinx-build' to 'sphinx-build-3' |
Date: |
Mon, 20 Feb 2023 20:24:55 -0500 |
Once upon a time, "sphinx-build" on certain RPM platforms invoked
specifically a Python 2.x version, while "sphinx-build-3" was a distro
shim for the Python 3.x version.
These days, none of our supported platforms utilize a 2.x version, so it
should be safe to search for 'sphinx-build' prior to 'sphinx-build-3',
which will prefer pip/venv installed versions of sphinx if they're
available.
This adds an extremely convenient ability to test document building
ability in QEMU across multiple versions of Sphinx for the purposes of
compatibility testing.
Signed-off-by: John Snow <jsnow@redhat.com>
---
docs/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/meson.build b/docs/meson.build
index 9136fed3b73..906034f9a87 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -1,5 +1,5 @@
if get_option('sphinx_build') == ''
- sphinx_build = find_program(['sphinx-build-3', 'sphinx-build'],
+ sphinx_build = find_program(['sphinx-build', 'sphinx-build-3'],
required: get_option('docs'))
else
sphinx_build = find_program(get_option('sphinx_build'),
--
2.39.0
- [PATCH v3 0/6] Python: Drop support for Python 3.6, John Snow, 2023/02/20
- [PATCH v3 3/6] DO-NOT-MERGE: testing: Add Python >= 3.7 to Centos, OpenSuSE, John Snow, 2023/02/20
- [PATCH v3 5/6] meson: prefer 'sphinx-build' to 'sphinx-build-3',
John Snow <=
- Re: [PATCH v3 5/6] meson: prefer 'sphinx-build' to 'sphinx-build-3', Markus Armbruster, 2023/02/21
- Re: [PATCH v3 5/6] meson: prefer 'sphinx-build' to 'sphinx-build-3', John Snow, 2023/02/21
- Re: [PATCH v3 5/6] meson: prefer 'sphinx-build' to 'sphinx-build-3', Markus Armbruster, 2023/02/22
- Re: [PATCH v3 5/6] meson: prefer 'sphinx-build' to 'sphinx-build-3', John Snow, 2023/02/22
- Re: [PATCH v3 5/6] meson: prefer 'sphinx-build' to 'sphinx-build-3', Markus Armbruster, 2023/02/23
- Re: [PATCH v3 5/6] meson: prefer 'sphinx-build' to 'sphinx-build-3', Paolo Bonzini, 2023/02/23
Re: [PATCH v3 5/6] meson: prefer 'sphinx-build' to 'sphinx-build-3', Paolo Bonzini, 2023/02/21
[PATCH v3 6/6] Python: Drop support for Python 3.6, John Snow, 2023/02/20