[v4] improvement to Python detection, preparation for dropping 3.6

[PATCH 03/10] meson: prefer 'sphinx-build' to 'sphinx-build-3'

Posted by Paolo Bonzini 2 years, 11 months ago

From: John Snow <jsnow@redhat.com>

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>
Message-Id: <20230221012456.2607692-6-jsnow@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 docs/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/meson.build b/docs/meson.build
index 9136fed3b730..906034f9a87f 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.1

Re: [PATCH 03/10] meson: prefer 'sphinx-build' to 'sphinx-build-3'

Posted by Markus Armbruster 2 years, 11 months ago

Paolo Bonzini <pbonzini@redhat.com> writes:

> From: John Snow <jsnow@redhat.com>
>
> 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>
> Message-Id: <20230221012456.2607692-6-jsnow@redhat.com>

Accident?

> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  docs/meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/docs/meson.build b/docs/meson.build
> index 9136fed3b730..906034f9a87f 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'),

In review of the original "[PATCH v3 5/6] meson: prefer 'sphinx-build'
to 'sphinx-build-3'", I challenged the check for sphinx-build-3.

Re: [PATCH 03/10] meson: prefer 'sphinx-build' to 'sphinx-build-3'

Posted by Paolo Bonzini 2 years, 11 months ago

On 2/22/23 17:26, Markus Armbruster wrote:
> Paolo Bonzini <pbonzini@redhat.com> writes:
> 
>> From: John Snow <jsnow@redhat.com>
>>
>> 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>
>> Message-Id: <20230221012456.2607692-6-jsnow@redhat.com>
> 
> Accident?

No but I can remove it.

>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>> ---
>>   docs/meson.build | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/docs/meson.build b/docs/meson.build
>> index 9136fed3b730..906034f9a87f 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'),
> 
> In review of the original "[PATCH v3 5/6] meson: prefer 'sphinx-build'
> to 'sphinx-build-3'", I challenged the check for sphinx-build-3.

I missed your message from this morning.  I can remove this.

Paolo