From: Markus Armbruster <armbru@redhat.com>
To: John Snow <jsnow@redhat.com>
Cc: qemu-devel@nongnu.org, "Michael Roth" <michael.roth@amd.com>,
"Thomas Huth" <thuth@redhat.com>,
qemu-block@nongnu.org, "Cleber Rosa" <crosa@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Beraldo Leal" <bleal@redhat.com>,
"Kevin Wolf" <kwolf@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Hanna Reitz" <hreitz@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Daniel Berrange" <berrange@redhat.com>
Subject: Re: [PATCH v3 5/6] meson: prefer 'sphinx-build' to 'sphinx-build-3'
Date: Tue, 21 Feb 2023 07:50:26 +0100 [thread overview]
Message-ID: <87o7pnzf4d.fsf@pond.sub.org> (raw)
In-Reply-To: <20230221012456.2607692-6-jsnow@redhat.com> (John Snow's message of "Mon, 20 Feb 2023 20:24:55 -0500")
John Snow <jsnow@redhat.com> writes:
> 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'),
Do we still need to check for sphinx-build-3? Or asked differently, is
there any supported build host that provides only sphinx-build-3?
next prev parent reply other threads:[~2023-02-21 6:50 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-21 1:24 [PATCH v3 0/6] Python: Drop support for Python 3.6 John Snow
2023-02-21 1:24 ` [PATCH v3 1/6] configure: Look for auxiliary Python installations John Snow
2023-02-21 11:03 ` Paolo Bonzini
2023-02-21 17:37 ` John Snow
2023-02-21 17:54 ` Daniel P. Berrangé
2023-02-24 18:04 ` Eric Blake
2023-02-21 1:24 ` [PATCH v3 2/6] configure: Add courtesy hint to Python version failure message John Snow
2023-02-21 7:33 ` Philippe Mathieu-Daudé
2023-02-21 11:01 ` Paolo Bonzini
2023-02-21 1:24 ` [PATCH v3 3/6] DO-NOT-MERGE: testing: Add Python >= 3.7 to Centos, OpenSuSE John Snow
2023-02-21 1:24 ` [PATCH v3 4/6] DO-NOT-MERGE: testing: add pip-installed sphinx-build to CentOS 8 John Snow
2023-02-21 1:24 ` [PATCH v3 5/6] meson: prefer 'sphinx-build' to 'sphinx-build-3' John Snow
2023-02-21 6:50 ` Markus Armbruster [this message]
2023-02-21 16:49 ` John Snow
2023-02-22 7:14 ` Markus Armbruster
2023-02-23 4:40 ` John Snow
2023-02-23 6:13 ` Markus Armbruster
2023-02-23 8:53 ` Paolo Bonzini
2023-02-21 11:31 ` Paolo Bonzini
2023-02-21 12:37 ` Paolo Bonzini
2023-02-21 16:56 ` John Snow
2023-02-21 1:24 ` [PATCH v3 6/6] Python: Drop support for Python 3.6 John Snow
2023-02-21 7:11 ` Markus Armbruster
2023-02-21 7:00 ` [PATCH v3 0/6] " Markus Armbruster
2023-02-21 11:33 ` Paolo Bonzini
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=87o7pnzf4d.fsf@pond.sub.org \
--to=armbru@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=bleal@redhat.com \
--cc=crosa@redhat.com \
--cc=hreitz@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=michael.roth@amd.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.