From nobody Fri Oct 3 08:51:18 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9D2E0285057; Wed, 3 Sep 2025 15:45:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756914301; cv=none; b=oKraLeLO6qY7Gpk4PaWxNlhj1zdVsZJLXz6tLDJiHbvCVWd59PHVBac5kHkDfDgCZk4Q2UOcJ31JLfuY554T8gBWKocqOsMkp3ZOWeSWapSY5V7adYUDCo3FFfGNIx121o8udk4UY91RQ5xMDxiAtr6/vypxBMS4/KFH2PisEuI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756914301; c=relaxed/simple; bh=FBWucXdyWLLs836/YCptcNQxfVLAAZk1Il0uQKnptzs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=g5zCV7mUry4bIWEJVQrT3/KdAzIkOvEHmOBFLFhYylyiyJBtkWuBieX9GpPJ0OMm7pDXUlFQ9PO+g6L38rd5Vagq88+snXkGgcXZ0wRjCwtocIn0xT3/HYu1veYCV+pSmsGZvuQVcjWy0/E6dRZW8Q4poqGaF9BPwBJ9jDqdaD4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PKMi0DJq; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="PKMi0DJq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D8AFC4CEF7; Wed, 3 Sep 2025 15:45:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1756914301; bh=FBWucXdyWLLs836/YCptcNQxfVLAAZk1Il0uQKnptzs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PKMi0DJqQI+p7ljivn/WK9A+PQYpv+F007yL8E9Sp2AKCRb/kTwQDBcmYSrz8Dqma QXjzqDbbVOrHKKDFdAMGvw3ijum71EYXk27vpvbUQRIslVbfkrobVm6Suv4yXDO0RP t4AqTTyAPehpNbeH1dEJaTSNyUvLB84QhpuP27snJlMGKxYNuxk8pkvgmcx/WD8w5P I5xGqaaucIFZ9SI99PRAg04M6B7vEyaUrSlWrk9ALvpIrf/6Em0+lmueWkb37so8gB nYH7kEeiknMS5j1eV6DFXwjKnmpK7pcDi6wtN60DacuzctCROFc0ykAoVh4tSreWMD iTj71C6CdjsCA== Received: from mchehab by mail.kernel.org with local (Exim 4.98.2) (envelope-from ) id 1utpfP-00000007N6X-2Rz4; Wed, 03 Sep 2025 17:44:59 +0200 From: Mauro Carvalho Chehab To: Jonathan Corbet , Linux Doc Mailing List Cc: Mauro Carvalho Chehab , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org Subject: [PATCH RFC 2/3] tools/docs: python_version: allow check for alternatives and bail out Date: Wed, 3 Sep 2025 17:44:35 +0200 Message-ID: X-Mailer: git-send-email 2.51.0 In-Reply-To: References: Content-Type: text/plain; charset="utf-8" Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab The caller script may not want an automatic execution of the new version. Add two parameters to allow showing alternatives and to bail out if version is incompatible. Signed-off-by: Mauro Carvalho Chehab --- tools/docs/lib/python_version.py | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/tools/docs/lib/python_version.py b/tools/docs/lib/python_versi= on.py index 660bfe7d23fa..e2e9f9a3d421 100644 --- a/tools/docs/lib/python_version.py +++ b/tools/docs/lib/python_version.py @@ -85,10 +85,12 @@ class PythonVersion: may need to update it one day, hopefully on a distant future. """ patterns =3D [ - "python3.[0-9]", "python3.[0-9][0-9]", + "python3.[0-9]", ] =20 + python_cmd =3D [] + # Seek for a python binary newer than min_version for path in os.getenv("PATH", "").split(":"): for pattern in patterns: @@ -96,12 +98,12 @@ class PythonVersion: if os.path.isfile(cmd) and os.access(cmd, os.X_OK): version =3D PythonVersion.get_python_version(cmd) if version >=3D min_version: - return cmd + python_cmd.append((version, cmd)) =20 - return None + return sorted(python_cmd, reverse=3DTrue) =20 @staticmethod - def check_python(min_version): + def check_python(min_version, show_alternatives=3DFalse, bail_out=3DFa= lse): """ Check if the current python binary satisfies our minimal requireme= nt for Sphinx build. If not, re-run with a newer version if found. @@ -113,18 +115,33 @@ class PythonVersion: =20 python_ver =3D PythonVersion.ver_str(cur_ver) =20 - new_python_cmd =3D PythonVersion.find_python(min_version) - if not new_python_cmd: + available_versions =3D PythonVersion.find_python(min_version) + if not available_versions: print(f"ERROR: Python version {python_ver} is not spported any= more\n") print(" Can't find a new version. This script may fail") return =20 - # Restart script using the newer version + # Check possible alternatives + if available_versions: + new_python_cmd =3D available_versions[0][1] + else: + new_python_cmd =3D None + script_path =3D os.path.abspath(sys.argv[0]) args =3D [new_python_cmd, script_path] + sys.argv[1:] =20 + if show_alternatives: + print("Available Python versions:") + for _, cmd in available_versions: + print(f" {cmd}") + print() + + if bail_out: + sys.exit(f"Python {python_ver} not supported. Bailing out") + print(f"Python {python_ver} not supported. Changing to {new_python= _cmd}") =20 + # Restart script using the newer version try: os.execv(new_python_cmd, args) except OSError as e: --=20 2.51.0