| Message ID | 20200923162908.95372-1-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | None | expand |
Should we also warning it in meson.build, cause configure finally shoud be removed. On Thu, Sep 24, 2020 at 12:32 AM Thomas Huth <thuth@redhat.com> wrote: > > All our supported build platforms have Python 3.6 or newer nowadays, and > there are some useful features in Python 3.6 which are not available in > 3.5 yet (e.g. the type hint annotations which will allow us to statically > type the QAPI parser), so let's bump the minimum Python version to 3.6 now. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > v2: > - Bump the version in docs/conf.py, too > - Remove the now unnecessary check in tests/qemu-iotests/iotests.py > > configure | 4 ++-- > docs/conf.py | 4 ++-- > tests/qemu-iotests/iotests.py | 2 -- > 3 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/configure b/configure > index 7564479008..a3a643168e 100755 > --- a/configure > +++ b/configure > @@ -1965,8 +1965,8 @@ fi > > # Note that if the Python conditional here evaluates True we will exit > # with status 1 which is a shell 'false' value. > -if ! $python -c 'import sys; sys.exit(sys.version_info < (3,5))'; then > - error_exit "Cannot use '$python', Python >= 3.5 is required." \ > +if ! $python -c 'import sys; sys.exit(sys.version_info < (3,6))'; then > + error_exit "Cannot use '$python', Python >= 3.6 is required." \ > "Use --python=/path/to/python to specify a supported Python." > fi > > diff --git a/docs/conf.py b/docs/conf.py > index 0dbd90dc11..8aeac40124 100644 > --- a/docs/conf.py > +++ b/docs/conf.py > @@ -36,9 +36,9 @@ from sphinx.errors import ConfigError > # In newer versions of Sphinx this will display nicely; in older versions > # Sphinx will also produce a Python backtrace but at least the information > # gets printed... > -if sys.version_info < (3,5): > +if sys.version_info < (3,6): > raise ConfigError( > - "QEMU requires a Sphinx that uses Python 3.5 or better\n") > + "QEMU requires a Sphinx that uses Python 3.6 or better\n") > > # The per-manual conf.py will set qemu_docdir for a single-manual build; > # otherwise set it here if this is an entire-manual-set build. > diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py > index 91e4a57126..f48460480a 100644 > --- a/tests/qemu-iotests/iotests.py > +++ b/tests/qemu-iotests/iotests.py > @@ -40,8 +40,6 @@ sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python')) > from qemu import qtest > from qemu.qmp import QMPMessage > > -assert sys.version_info >= (3, 6) > - > # Use this logger for logging messages directly from the iotests module > logger = logging.getLogger('qemu.iotests') > logger.addHandler(logging.NullHandler()) > -- > 2.18.2 > > -- 此致 礼 罗勇刚 Yours sincerely, Yonggang Luo <div dir="ltr">Should we also warning it in meson.build, cause configure finally shoud be removed.<br><br>On Thu, Sep 24, 2020 at 12:32 AM Thomas Huth <<a href="mailto:thuth@redhat.com">thuth@redhat.com</a>> wrote:<br>><br>> All our supported build platforms have Python 3.6 or newer nowadays, and<br>> there are some useful features in Python 3.6 which are not available in<br>> 3.5 yet (e.g. the type hint annotations which will allow us to statically<br>> type the QAPI parser), so let's bump the minimum Python version to 3.6 now.<br>><br>> Signed-off-by: Thomas Huth <<a href="mailto:thuth@redhat.com">thuth@redhat.com</a>><br>> ---<br>> v2:<br>> - Bump the version in docs/conf.py, too<br>> - Remove the now unnecessary check in tests/qemu-iotests/iotests.py<br>><br>> configure | 4 ++--<br>> docs/conf.py | 4 ++--<br>> tests/qemu-iotests/iotests.py | 2 --<br>> 3 files changed, 4 insertions(+), 6 deletions(-)<br>><br>> diff --git a/configure b/configure<br>> index 7564479008..a3a643168e 100755<br>> --- a/configure<br>> +++ b/configure<br>> @@ -1965,8 +1965,8 @@ fi<br>><br>> # Note that if the Python conditional here evaluates True we will exit<br>> # with status 1 which is a shell 'false' value.<br>> -if ! $python -c 'import sys; sys.exit(sys.version_info < (3,5))'; then<br>> - error_exit "Cannot use '$python', Python >= 3.5 is required." \<br>> +if ! $python -c 'import sys; sys.exit(sys.version_info < (3,6))'; then<br>> + error_exit "Cannot use '$python', Python >= 3.6 is required." \<br>> "Use --python=/path/to/python to specify a supported Python."<br>> fi<br>><br>> diff --git a/docs/conf.py b/docs/conf.py<br>> index 0dbd90dc11..8aeac40124 100644<br>> --- a/docs/conf.py<br>> +++ b/docs/conf.py<br>> @@ -36,9 +36,9 @@ from sphinx.errors import ConfigError<br>> # In newer versions of Sphinx this will display nicely; in older versions<br>> # Sphinx will also produce a Python backtrace but at least the information<br>> # gets printed...<br>> -if sys.version_info < (3,5):<br>> +if sys.version_info < (3,6):<br>> raise ConfigError(<br>> - "QEMU requires a Sphinx that uses Python 3.5 or better\n")<br>> + "QEMU requires a Sphinx that uses Python 3.6 or better\n")<br>><br>> # The per-manual conf.py will set qemu_docdir for a single-manual build;<br>> # otherwise set it here if this is an entire-manual-set build.<br>> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py<br>> index 91e4a57126..f48460480a 100644<br>> --- a/tests/qemu-iotests/iotests.py<br>> +++ b/tests/qemu-iotests/iotests.py<br>> @@ -40,8 +40,6 @@ sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python'))<br>> from qemu import qtest<br>> from qemu.qmp import QMPMessage<br>><br>> -assert sys.version_info >= (3, 6)<br>> -<br>> # Use this logger for logging messages directly from the iotests module<br>> logger = logging.getLogger('qemu.iotests')<br>> logger.addHandler(logging.NullHandler())<br>> --<br>> 2.18.2<br>><br>><br><br><br>--<br> 此致<br>礼<br>罗勇刚<br>Yours<br> sincerely,<br>Yonggang Luo</div>
On 23/09/2020 18.34, 罗勇刚(Yonggang Luo) wrote: > Should we also warning it in meson.build, cause configure finally shoud > be removed. Sounds like a good idea for a separate patch (let's do one issue at a time...). Thomas
diff --git a/configure b/configure index 7564479008..a3a643168e 100755 --- a/configure +++ b/configure @@ -1965,8 +1965,8 @@ fi # Note that if the Python conditional here evaluates True we will exit # with status 1 which is a shell 'false' value. -if ! $python -c 'import sys; sys.exit(sys.version_info < (3,5))'; then - error_exit "Cannot use '$python', Python >= 3.5 is required." \ +if ! $python -c 'import sys; sys.exit(sys.version_info < (3,6))'; then + error_exit "Cannot use '$python', Python >= 3.6 is required." \ "Use --python=/path/to/python to specify a supported Python." fi diff --git a/docs/conf.py b/docs/conf.py index 0dbd90dc11..8aeac40124 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -36,9 +36,9 @@ from sphinx.errors import ConfigError # In newer versions of Sphinx this will display nicely; in older versions # Sphinx will also produce a Python backtrace but at least the information # gets printed... -if sys.version_info < (3,5): +if sys.version_info < (3,6): raise ConfigError( - "QEMU requires a Sphinx that uses Python 3.5 or better\n") + "QEMU requires a Sphinx that uses Python 3.6 or better\n") # The per-manual conf.py will set qemu_docdir for a single-manual build; # otherwise set it here if this is an entire-manual-set build. diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 91e4a57126..f48460480a 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -40,8 +40,6 @@ sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python')) from qemu import qtest from qemu.qmp import QMPMessage -assert sys.version_info >= (3, 6) - # Use this logger for logging messages directly from the iotests module logger = logging.getLogger('qemu.iotests') logger.addHandler(logging.NullHandler())
All our supported build platforms have Python 3.6 or newer nowadays, and there are some useful features in Python 3.6 which are not available in 3.5 yet (e.g. the type hint annotations which will allow us to statically type the QAPI parser), so let's bump the minimum Python version to 3.6 now. Signed-off-by: Thomas Huth <thuth@redhat.com> --- v2: - Bump the version in docs/conf.py, too - Remove the now unnecessary check in tests/qemu-iotests/iotests.py configure | 4 ++-- docs/conf.py | 4 ++-- tests/qemu-iotests/iotests.py | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-)