configure: Bump the minimum required Python version to 3.6
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> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20200923162908.95372-1-thuth@redhat.com> Message-Id: <20200925154027.12672-16-alex.bennee@linaro.org>
This commit is contained in:
parent
254ef17e3f
commit
1b11f28d05
4
configure
vendored
4
configure
vendored
@ -1964,8 +1964,8 @@ fi
|
|||||||
|
|
||||||
# Note that if the Python conditional here evaluates True we will exit
|
# Note that if the Python conditional here evaluates True we will exit
|
||||||
# with status 1 which is a shell 'false' value.
|
# with status 1 which is a shell 'false' value.
|
||||||
if ! $python -c 'import sys; sys.exit(sys.version_info < (3,5))'; then
|
if ! $python -c 'import sys; sys.exit(sys.version_info < (3,6))'; then
|
||||||
error_exit "Cannot use '$python', Python >= 3.5 is required." \
|
error_exit "Cannot use '$python', Python >= 3.6 is required." \
|
||||||
"Use --python=/path/to/python to specify a supported Python."
|
"Use --python=/path/to/python to specify a supported Python."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -36,9 +36,9 @@ from sphinx.errors import ConfigError
|
|||||||
# In newer versions of Sphinx this will display nicely; in older versions
|
# In newer versions of Sphinx this will display nicely; in older versions
|
||||||
# Sphinx will also produce a Python backtrace but at least the information
|
# Sphinx will also produce a Python backtrace but at least the information
|
||||||
# gets printed...
|
# gets printed...
|
||||||
if sys.version_info < (3,5):
|
if sys.version_info < (3,6):
|
||||||
raise ConfigError(
|
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;
|
# 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.
|
# otherwise set it here if this is an entire-manual-set build.
|
||||||
|
@ -40,8 +40,6 @@ sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python'))
|
|||||||
from qemu import qtest
|
from qemu import qtest
|
||||||
from qemu.qmp import QMPMessage
|
from qemu.qmp import QMPMessage
|
||||||
|
|
||||||
assert sys.version_info >= (3, 6)
|
|
||||||
|
|
||||||
# Use this logger for logging messages directly from the iotests module
|
# Use this logger for logging messages directly from the iotests module
|
||||||
logger = logging.getLogger('qemu.iotests')
|
logger = logging.getLogger('qemu.iotests')
|
||||||
logger.addHandler(logging.NullHandler())
|
logger.addHandler(logging.NullHandler())
|
||||||
|
Loading…
Reference in New Issue
Block a user