From nobody Tue Nov 26 06:24:04 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=1709545027; cv=none; d=zohomail.com; s=zohoarc; b=RWrdM6/cX7pHn7IiCRyJ/usOCPHEv2C/FcG4VxUv07Fpb0g6rmqBokbVfpMPmz1fJWERsPo8RXyeLCG9w1MNaN9SU1aRvEe7DOt+B/y/AMqv1+K7MeSzcRvePQ5QjMpf+vCj0KmT/oEb4r371RmCijlh4TbV2E8nisqnqi9K/7s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1709545027; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=6tCBLppeIY+B0Jr+8LBoWGpKyrzC5N8MNDL8FrxuMts=; b=ARwV37anZ5keoi/iyeR/NpBUegN4a9ZNz18w3SKBLeqdqjZz+XWlr5EWxTzAooFJpzUwOPoMx1LBeEmiYyeYTVvyxjWYig/XGAE47GcsMjchAQX8/IJ/ighez0AXLh1G8pvqWuTOZX7D1imrxUfeRv996MkBd+vvqh/lusyew3g= 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 1709545027725813.3566986820937; Mon, 4 Mar 2024 01:37:07 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rh4kT-0003cV-M8; Mon, 04 Mar 2024 04:36:42 -0500 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 1rh4kP-0003bw-K8 for qemu-devel@nongnu.org; Mon, 04 Mar 2024 04:36:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rh4kN-000700-Fx for qemu-devel@nongnu.org; Mon, 04 Mar 2024 04:36:37 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-42-M5SuqMPEODG-sMmw8Zej7Q-1; Mon, 04 Mar 2024 04:36:31 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F38F33C0F366; Mon, 4 Mar 2024 09:36:30 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id BC6B51121313; Mon, 4 Mar 2024 09:36:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709544993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=6tCBLppeIY+B0Jr+8LBoWGpKyrzC5N8MNDL8FrxuMts=; b=gnGVBf9tWMBDQQWXBldPWlEuiy0dxpSHXX6g1St+s56NWMhu42OX8GxUWm13bk1VE3qfIf 9iW7XPdjy6nRHKqBlf00sP9kPNmb5PvavP2xzLnvDN1zktr8fpV0u/tIAv2nHOPMOXkdCU ggDd1GMEpEhYZsYH/M0tDdYfd9kOsWM= X-MC-Unique: M5SuqMPEODG-sMmw8Zej7Q-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Cc: qemu-stable@nongnu.org, =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Thomas Huth Subject: [PATCH] docs/conf.py: Remove usage of distutils Date: Mon, 4 Mar 2024 10:36:18 +0100 Message-ID: <20240304093618.24131-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 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.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.589, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 1709545028595100003 Content-Type: text/plain; charset="utf-8" The macOS jobs in our CI recently started failing, complaining that the distutils module is not available anymore. And indeed, according to https://peps.python.org/pep-0632/ it's been deprecated since a while and now likely got removed in recent Python versions. Fortunately, we only use it for a version check via LooseVersion here which we don't really need anymore: All distros ship newer versions of Sphinx now (see https://repology.org/project/python:sphinx/versions - the oldest one is 0.6.6 on CentOS 6!), so we can simply drop the version check now. Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michael Tokarev --- docs/conf.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index e84a95e71c..1b2afa241c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -29,7 +29,6 @@ import os import sys import sphinx -from distutils.version import LooseVersion from sphinx.errors import ConfigError =20 # The per-manual conf.py will set qemu_docdir for a single-manual build; @@ -165,11 +164,10 @@ # Theme options are theme-specific and customize the look and feel of a th= eme # further. For a list of options available for each theme, see the # documentation. -if LooseVersion(sphinx_rtd_theme.__version__) >=3D LooseVersion("0.4.3"): - html_theme_options =3D { - "style_nav_header_background": "#802400", - "navigation_with_keys": True, - } +html_theme_options =3D { + "style_nav_header_background": "#802400", + "navigation_with_keys": True, +} =20 html_logo =3D os.path.join(qemu_docdir, "../ui/icons/qemu_128x128.png") =20 --=20 2.44.0