[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/14] configure: Bump the minimum required Python version to 3.6
From: |
Alex Bennée |
Subject: |
[PULL 12/14] configure: Bump the minimum required Python version to 3.6 |
Date: |
Fri, 2 Oct 2020 12:36:43 +0100 |
From: Thomas Huth <thuth@redhat.com>
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>
diff --git a/docs/conf.py b/docs/conf.py
index 606f623211..00e1b750e2 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/configure b/configure
index ca9b458ea0..a5841241be 100755
--- a/configure
+++ b/configure
@@ -1964,8 +1964,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/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.20.1
- [PULL 00/14] testing updates (python, plugins), Alex Bennée, 2020/10/02
- [PULL 01/14] migration: Silence compiler warning in global_state_store_running(), Alex Bennée, 2020/10/02
- [PULL 02/14] travis.yml: Drop the default softmmu builds, Alex Bennée, 2020/10/02
- [PULL 06/14] tests/docker: Use Fedora containers for MinGW cross-builds in the gitlab-CI, Alex Bennée, 2020/10/02
- [PULL 04/14] travis.yml: Drop the superfluous Python 3.6 build, Alex Bennée, 2020/10/02
- [PULL 09/14] shippable.yml: Remove the Debian9-based MinGW cross-compiler tests, Alex Bennée, 2020/10/02
- [PULL 11/14] gitlab-ci: Increase the timeout for the cross-compiler builds, Alex Bennée, 2020/10/02
- [PULL 03/14] travis.yml: Update Travis to use Bionic and Focal instead of Xenial, Alex Bennée, 2020/10/02
- [PULL 12/14] configure: Bump the minimum required Python version to 3.6,
Alex Bennée <=
- [PULL 05/14] travis.yml: Drop the Python 3.5 build, Alex Bennée, 2020/10/02
- [PULL 10/14] tests/docker: Remove old Debian 9 containers, Alex Bennée, 2020/10/02
- [PULL 08/14] tests/docker: Update the tricore container to debian 10, Alex Bennée, 2020/10/02
- [PULL 13/14] gitlab: move linux-user plugins test across to gitlab, Alex Bennée, 2020/10/02
- [PULL 07/14] gitlab-ci: Remove the Debian9-based containers and containers-layer3, Alex Bennée, 2020/10/02
- [PULL 14/14] gitlab: split deprecated job into build/check stages, Alex Bennée, 2020/10/02
- Re: [PULL 00/14] testing updates (python, plugins), Peter Maydell, 2020/10/02