From nobody Thu Nov 28 08:33:58 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693821519; cv=none; d=zohomail.com; s=zohoarc; b=AhAsujLpwzbHVcajZxBX+ewlkWz1S48xm3FnzyPszTCCX6WGXPsN0qDFAvsl7DkngEF+utjjiC9xcdkuu4YwmPob4Oy+elKEp9UwQH3fmu8jxnlx1mGL3rBHbMwUG/X1QELGPmuRyAJQ5Eb73nJ9g14C/iWGYWmy9BqQHURHotc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693821519; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IFXyNZ8QXJiCq5ljFwwNbK2DgAER6VNuQmQR9ryjPQM=; b=DQKjlkzQ+AglYTrTIfQmE95tSd+3/M2noIrA3vjLZcpWwBL6FuHHrcQc5+3GRPp15aSQfEHDPB3lNDuZ0Q19ySUtVO2OVLHcsAEmm1ElRibp8P2Rz7taTh41/o1Nw1lnuVl+E8f22KXC+ZtHblR/rUqbwg6pXEHs8K4i4Oas6pI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 169382151910925.438415399002906; Mon, 4 Sep 2023 02:58:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qd6Kv-0005tY-Ic; Mon, 04 Sep 2023 05:57:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qd6Kp-0005sj-RS for qemu-devel@nongnu.org; Mon, 04 Sep 2023 05:57:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qd6Kn-0006mK-7k for qemu-devel@nongnu.org; Mon, 04 Sep 2023 05:57:31 -0400 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-589-pqIHSl6zNzOrRidyHeZGCQ-1; Mon, 04 Sep 2023 05:57:27 -0400 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-3f5df65f9f4so8171345e9.2 for ; Mon, 04 Sep 2023 02:57:26 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id bj13-20020a0560001e0d00b00317b5c8a4f1sm1044297wrb.60.2023.09.04.02.57.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Sep 2023 02:57:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693821448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IFXyNZ8QXJiCq5ljFwwNbK2DgAER6VNuQmQR9ryjPQM=; b=WR34KO+RcGAXRCsYlLH1JUGMqbsfJS53oghmgp34nGfFwU5Hj84xFPZjIrvou7EVKD8odo FgDwiwPfIs54O/uDT2pWQyCry9c+rIfQx6Kx/y8+KKxbKkBpNHlZTpnOQUxwx8R0i7ic3T F+vekDkmYevR01B35pmgB7zJWTtSZkg= X-MC-Unique: pqIHSl6zNzOrRidyHeZGCQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693821445; x=1694426245; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IFXyNZ8QXJiCq5ljFwwNbK2DgAER6VNuQmQR9ryjPQM=; b=ODWgc7T33LFIsKNhiMTBg0aSlH+7y3KEzUPs8yo6A1kpvhN64imSJIxx/VcWrPG5KW USoXvpvIs6Ep8Dr6vchTKM/YnX5ecYA6ntG7H2Soh1SXFyKRM53SBOFfeJW0/ziXMqjS RIakGoWudfytS9OzGK1ILyDcltb4kfftDQXDEG5gwL1WldURvQCV/L2dwCwh8IaZbFyy SoKbrFwPRPkX3uUzqpIkHRqk0nlpXQcUdk9bYYJVHC0xI8DKBZNLbfZNXhYRUdzoEkPQ k9AzGgf6ACBL/F1u8j+Vj/lbJxL8ipVZr/5dN1i98m8SKJ13chgfmqnMUUnCSIAfwOQK UlPw== X-Gm-Message-State: AOJu0YwV9CRoYEE8mlfzgLOZ9qy3mrDz9fpZRBcHP4vINxBCuoRt5E3I 8UnPHlKOed1YhlZv0LcMGQ4c7nLnUXKUbUHp2mSM9NDmLueiCtDlAH7kBwS5C5FgB0KglQgwdBp HFEWn5DKYlvTQoSa1K0VllQXu7x6e/URKbzKeXcmBs91n7TlPGD3LllEaHmROkpXjZlc9XwpPyQ c= X-Received: by 2002:a5d:69cb:0:b0:316:e249:c285 with SMTP id s11-20020a5d69cb000000b00316e249c285mr5875148wrw.71.1693821444717; Mon, 04 Sep 2023 02:57:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHGGR0sdIxB/dKWAs8MMm7vX5mJGDRFl9oGt3tcL6BTNcN79thHDCWeWXa+qNSYlRvGgxB2Hg== X-Received: by 2002:a5d:69cb:0:b0:316:e249:c285 with SMTP id s11-20020a5d69cb000000b00316e249c285mr5875131wrw.71.1693821444252; Mon, 04 Sep 2023 02:57:24 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: jsnow@redhat.com, armbru@redhat.com, peter.maydell@linaro.org, berrange@redhat.com Subject: [RFC PATCH 1/3] Python: Drop support for Python 3.7 Date: Mon, 4 Sep 2023 11:57:18 +0200 Message-ID: <20230904095720.154738-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230904095720.154738-1-pbonzini@redhat.com> References: <20230904095720.154738-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1693821519548100001 Content-Type: text/plain; charset="utf-8" Debian 10 is not anymore a supported distro, since Debian 12 was released on June 10, 2023. Our supported build platforms as of today all support at least 3.8 (and all of them except for Ubuntu 20.04 support 3.9): openSUSE Leap 15.5: 3.6.15 (3.11.2) CentOS Stream 8: 3.6.8 (3.8.13, 3.9.16, 3.11.4) CentOS Stream 9: 3.9.17 (3.11.4) Fedora 37: 3.11.4 Fedora 38: 3.11.4 Debian 11: 3.9.2 Debian 12: 3.11.2 Alpine 3.14, 3.15: 3.9.16 Alpine 3.16, 3.17: 3.10.10 Ubuntu 20.04 LTS: 3.8.10 Ubuntu 22.04 LTS: 3.10.12 NetBSD 9.3: 3.9.13* FreeBSD 12.4: 3.9.16 FreeBSD 13.1: 3.9.18 OpenBSD 7.2: 3.9.17 Note: NetBSD does not appear to have a default meta-package, but offers several options, the lowest of which is 3.7.15. However, "python39" appears to be a pre-requisite to one of the other packages we request in tests/vm/netbsd. Since it is safe to under our supported platform policy, bump our minimum supported version of Python to 3.8. The two most interesting features to have by default include: - the importlib.metadata module, whose lack is responsible for over 100 lines of code in mkvenv.py - improvements to asyncio, for example asyncio.CancelledError inherits from BaseException rather than Exception In addition, code can now use the assignment operator ':=3D' Because mypy now learns about importlib.metadata, a small change to mkvenv.py is needed to pass type checking. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- configure | 8 ++++---- python/Makefile | 8 ++++---- python/scripts/mkvenv.py | 5 ++++- python/setup.cfg | 7 +++---- python/tests/minreqs.txt | 2 +- scripts/qapi/mypy.ini | 2 +- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/configure b/configure index 83bbdfe8cdc..72e21cf5b62 100755 --- a/configure +++ b/configure @@ -552,16 +552,16 @@ if test -n "$linux_arch" && ! test -d "$source_path/l= inux-headers/asm-$linux_arc fi =20 check_py_version() { - # We require python >=3D 3.7. + # We require python >=3D 3.8. # NB: a True python conditional creates a non-zero return code (Failur= e) - "$1" -c 'import sys; sys.exit(sys.version_info < (3,7))' + "$1" -c 'import sys; sys.exit(sys.version_info < (3,8))' } =20 first_python=3D if test -z "${PYTHON}"; then # A bare 'python' is traditionally python 2.x, but some distros # have it as python 3.x, so check in both places. - for binary in python3 python python3.11 python3.10 python3.9 python3.8= python3.7; do + for binary in python3 python python3.11 python3.10 python3.9 python3.8= ; do if has "$binary"; then python=3D$(command -v "$binary") if check_py_version "$python"; then @@ -952,7 +952,7 @@ then fi =20 if ! check_py_version "$python"; then - error_exit "Cannot use '$python', Python >=3D 3.7 is required." \ + error_exit "Cannot use '$python', Python >=3D 3.8 is required." \ "Use --python=3D/path/to/python to specify a supported Python= ." \ "Maybe try:" \ " openSUSE Leap 15.3+: zypper install python39" \ diff --git a/python/Makefile b/python/Makefile index 7c70dcc8d14..1fa4ba2498e 100644 --- a/python/Makefile +++ b/python/Makefile @@ -9,13 +9,13 @@ help: @echo "make check-minreqs:" @echo " Run tests in the minreqs virtual environment." @echo " These tests use the oldest dependencies." - @echo " Requires: Python 3.7" - @echo " Hint (Fedora): 'sudo dnf install python3.7'" + @echo " Requires: Python 3.8" + @echo " Hint (Fedora): 'sudo dnf install python3.8'" @echo "" @echo "make check-tox:" @echo " Run tests against multiple python versions." @echo " These tests use the newest dependencies." - @echo " Requires: Python 3.7 - 3.11, and tox." + @echo " Requires: Python 3.8 - 3.11, and tox." @echo " Hint (Fedora): 'sudo dnf install python3-tox python3.11'" @echo " The variable QEMU_TOX_EXTRA_ARGS can be use to pass extra" @echo " arguments to tox". @@ -59,7 +59,7 @@ PIP_INSTALL =3D pip install --disable-pip-version-check min-venv: $(QEMU_MINVENV_DIR) $(QEMU_MINVENV_DIR)/bin/activate $(QEMU_MINVENV_DIR) $(QEMU_MINVENV_DIR)/bin/activate: setup.cfg tests/minr= eqs.txt @echo "VENV $(QEMU_MINVENV_DIR)" - @python3.7 -m venv $(QEMU_MINVENV_DIR) + @python3.8 -m venv $(QEMU_MINVENV_DIR) @( \ echo "ACTIVATE $(QEMU_MINVENV_DIR)"; \ . $(QEMU_MINVENV_DIR)/bin/activate; \ diff --git a/python/scripts/mkvenv.py b/python/scripts/mkvenv.py index 4f2349fbb65..57a24948031 100644 --- a/python/scripts/mkvenv.py +++ b/python/scripts/mkvenv.py @@ -435,6 +435,7 @@ def _gen_importlib(packages: Sequence[str]) -> Iterator= [str]: try: # First preference: Python 3.8+ stdlib from importlib.metadata import ( # type: ignore + EntryPoint, PackageNotFoundError, distribution, ) @@ -442,6 +443,7 @@ def _gen_importlib(packages: Sequence[str]) -> Iterator= [str]: logger.debug("%s", str(exc)) # Second preference: Commonly available PyPI backport from importlib_metadata import ( # type: ignore + EntryPoint, PackageNotFoundError, distribution, ) @@ -449,7 +451,8 @@ def _gen_importlib(packages: Sequence[str]) -> Iterator= [str]: def _generator() -> Iterator[str]: for package in packages: try: - entry_points =3D distribution(package).entry_points + entry_points: Iterator[EntryPoint] =3D \ + iter(distribution(package).entry_points) except PackageNotFoundError: continue =20 diff --git a/python/setup.cfg b/python/setup.cfg index e74b58a8c24..f6d2d8a1362 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -14,7 +14,6 @@ classifiers =3D Natural Language :: English Operating System :: OS Independent Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 @@ -22,7 +21,7 @@ classifiers =3D Typing :: Typed =20 [options] -python_requires =3D >=3D 3.7 +python_requires =3D >=3D 3.8 packages =3D qemu.qmp qemu.machine @@ -76,7 +75,7 @@ exclude =3D __pycache__, =20 [mypy] strict =3D True -python_version =3D 3.7 +python_version =3D 3.8 warn_unused_configs =3D True namespace_packages =3D True warn_unused_ignores =3D False @@ -192,7 +191,7 @@ multi_line_output=3D3 # of python available on your system to run this test. =20 [tox:tox] -envlist =3D py37, py38, py39, py310, py311 +envlist =3D py38, py39, py310, py311 skip_missing_interpreters =3D true =20 [testenv] diff --git a/python/tests/minreqs.txt b/python/tests/minreqs.txt index 979461be6bb..a3f423efd84 100644 --- a/python/tests/minreqs.txt +++ b/python/tests/minreqs.txt @@ -1,5 +1,5 @@ # This file lists the ***oldest possible dependencies*** needed to run -# "make check" successfully under ***Python 3.7***. It is used primarily +# "make check" successfully under ***Python 3.8***. It is used primarily # by GitLab CI to ensure that our stated minimum versions in setup.cfg # are truthful and regularly validated. # diff --git a/scripts/qapi/mypy.ini b/scripts/qapi/mypy.ini index 3463307ddc7..56e0dfb1327 100644 --- a/scripts/qapi/mypy.ini +++ b/scripts/qapi/mypy.ini @@ -1,7 +1,7 @@ [mypy] strict =3D True disallow_untyped_calls =3D False -python_version =3D 3.7 +python_version =3D 3.8 =20 [mypy-qapi.schema] disallow_untyped_defs =3D False --=20 2.41.0