From patchwork Tue Nov 14 15:18:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 743791 Delivered-To: patch@linaro.org Received: by 2002:a5d:67cf:0:b0:32d:baff:b0ca with SMTP id n15csp2227863wrw; Tue, 14 Nov 2023 07:18:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IH1oPlYR5k9PYrvPqo0qdgG0N8A2yjqHbGbzSzvTXk2KgnYFGBE3eomu7xyWFiYgbFYosiJ X-Received: by 2002:a50:ff10:0:b0:53d:a7d9:5149 with SMTP id a16-20020a50ff10000000b0053da7d95149mr5585772edu.6.1699975097355; Tue, 14 Nov 2023 07:18:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699975097; cv=none; d=google.com; s=arc-20160816; b=yWoowk2FBnrlEONW/UMfoIE5oSQTb106Q+j9OkOmnl/kOcW3OgDB8C29c2VkuiV0Uv InkQgogI4qIlhqWih8sRb+93Kp7GiaeVl4tcRRF1mRRs3ajlR/YMBMqaffQBpmwSld8p iQqwYvWkmiloyjPfNKHmYJly51yaMxKT3KkaW/mXSvpFUIfE0FxlimZA4lfQEpbvF95l AxQmXgBebtNrDJkUJIU3c/APqCe7DlJBOuVDyAAyHbHaLAD8u6IH5CE894MKHYIEsBbZ g3iTe3mLyXcaLoO8+Yj/bRPrdugnKjcHevpkosvsqnlzMsTH5Y9/sQ60XaGfW1Ss5ABV 4E2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:cc:to:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=tcS5cWQMgdaqDLOj8U8IULBbzXursLr9thbaS9yFdcg=; fh=4QQ7RQ8/SihG0ZZVKvSyuwL0zVQarUDqlHI6Xr7Xxno=; b=fZpI2ijqsvh5GWR+5KxNaeh6jILGR1TiS7NFrCAqDLvxvamshc4ZTum576qXPZhdA0 iFpgkpKEscxGQCKYPyLC/TcqZvvcnTOqIQB+xpz/h34HFfKmInlj1GrzEkCejrWdmirf tG44HvnnCZ67pIWJH7ITIaUbEjqk/1oFWd1nWtlLe2PDMEaUoxC35N3fc8fddZFOYi4s uPpXcXya25KyeKr5kcqYcbNA5scXBbFFtrkcJFDqGk25qCm9YeSVlEEKQYOSYaUC2fsr jybYfCrD7g/TyaEV82mJkqpfuL8py9mLVKer9bnvhYPJKUG1fcoKTkCyLpVISWpVRx/k P/jg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=s9xt3lVf; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id l12-20020a056402254c00b0053df6901da6si4206911edb.182.2023.11.14.07.18.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 07:18:17 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=s9xt3lVf; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6C8D28719F; Tue, 14 Nov 2023 16:18:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="s9xt3lVf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BCD1B870BC; Tue, 14 Nov 2023 16:18:10 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6A0F486FBC for ; Tue, 14 Nov 2023 16:18:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=caleb.connolly@linaro.org Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-407da05f05aso42457995e9.3 for ; Tue, 14 Nov 2023 07:18:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699975088; x=1700579888; darn=lists.denx.de; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=tcS5cWQMgdaqDLOj8U8IULBbzXursLr9thbaS9yFdcg=; b=s9xt3lVfRHUC54J5aY+vS2rTg5gWwI20tbGXdIhK+stw2oxom7pIJXYr8tkPOToLi6 pssf0iE4fXhjcCRucjtRx52O80UXtv4rV+Xw1EmX7d3mrhQarUQKDBAUUaXKkSavI+Fz o/G6SA/3WkOgpPUBCosA/I1yc3xYr5iVL1qDCjzAu/DpP6evZmW+dCbcTrx4jvGQdWiI knwCNAbFmxpimzw+fxMHaf5Db+y4Ma/ZwkQN/HoTny7Hoi6VboXvLlf4BgnjyiieoZiZ cZmGgsxKn3UBp6P+lfSdrjI2I0lDnXs6/X3AREclYrY2NmJ9jF63VSnKfQUXTa02UT2N EPxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699975088; x=1700579888; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=tcS5cWQMgdaqDLOj8U8IULBbzXursLr9thbaS9yFdcg=; b=hle41+5WQRtTODuKw0qHYFtlAS/pX8TjDY89q4NAktaX6Q+LgfIkRTswnqbYFKWcX0 Wyo0TNcoGR2KySCvr7Ez0TeymOBjEACVwI/9fz4ikWpabagOqQbVRXh65pCGat/KfJxC tZ42JSm/Wcm9pXfzto56rLw/hXBtQU9xt9fEvJw0pM6SlhQISd5NtD51vYicArCobO+a 8IvSQrsnQqBgubEA+C6rN+PYtlj5PEN7C64PtC3VhdKiKgp4aqNK+Pg3jDQpxfpNNAXE T9nLyhanc/kt7j21ntp4nICqNmt8J+XdCtgjPkVnZUupCqVF9lle+HLfzM2hBFK2MwKV 8p/Q== X-Gm-Message-State: AOJu0YyzTE0m6vekW3CGkCz7m1m1YH1WPAZ5RDJeX6v+osPM1Cylatt1 BYHtO2ADMiVpT1hsHC2CpQIx/yvym6ihizzSMb3+Zw== X-Received: by 2002:a5d:47c6:0:b0:32f:7db1:22fe with SMTP id o6-20020a5d47c6000000b0032f7db122femr10956937wrc.15.1699975087862; Tue, 14 Nov 2023 07:18:07 -0800 (PST) Received: from lion.localdomain ([79.79.179.141]) by smtp.gmail.com with ESMTPSA id o16-20020adfe810000000b0032326908972sm8099452wrm.17.2023.11.14.07.18.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 07:18:07 -0800 (PST) From: Caleb Connolly Date: Tue, 14 Nov 2023 15:18:02 +0000 Subject: [PATCH] doc: avoid using deprecated sphinx function MIME-Version: 1.0 Message-Id: <20231114-b4-sphinx-deprecation-v1-1-41687254ad8e@linaro.org> X-B4-Tracking: v=1; b=H4sIAKmPU2UC/x2MQQ5AQAwAvyI9a6KU4CvisFbRy5JdEYn4u8ZxM pl5IElUSdBnD0S5NOkeDCjPwG8urII6G0NZlBURMU6M6dg03DjLEcW70wrsqGX20tXUMFhrZtH 7/w7j+362DQpvZwAAAA== To: Tom Rini , Simon Glass Cc: u-boot@lists.denx.de, Caleb Connolly X-Mailer: b4 0.13-dev-4bd13 X-Developer-Signature: v=1; a=openpgp-sha256; l=1360; i=caleb.connolly@linaro.org; h=from:subject:message-id; bh=DnoD5kTNav3/2sj83ERgWIbMlNWzqi/UqKtpbIAgbv0=; b=owGbwMvMwCFYaeA6f6eBkTjjabUkhtTg/vVm8z9n8m6PL9GboHVmQaTjnezbP3XrHk5ebut3M Gxa29XbHaUsDIIcDLJiiiziJ5ZZNq29bK+xfcEFmDmsTCBDGLg4BWAi2/Yz/I/P4Wb/bdjLeLwo 6evGg1sbuzdPdk12v/Xrm49uz9Izwg8Y/jtMzLStXqKrsrZ1+VchvT+/2Sp2zK9YbtvFYDfFLTd FKgwA X-Developer-Key: i=caleb.connolly@linaro.org; a=openpgp; fpr=83B24DA7FE145076BC38BB250CD904EB673A7C47 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean The execfile_() function in sphinx has been removed after being deprecated for some time. Follow what sphinx upstream does in [1] to avoid using this function. This fixes "make htmldocs" on at least Arch Linux but likely other distros too. [1]: https://github.com/sphinx-doc/sphinx/commit/9ced1e355ad6baecd4e755a598a54877dc0aad44 Signed-off-by: Caleb Connolly --- base-commit: 92b27528d777ce85362af45e7d2974a6c856219b // Caleb (they/them) --- doc/sphinx/load_config.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/sphinx/load_config.py b/doc/sphinx/load_config.py index eeb394b39e2c..977b27084780 100644 --- a/doc/sphinx/load_config.py +++ b/doc/sphinx/load_config.py @@ -3,7 +3,6 @@ import os import sys -from sphinx.util.pycompat import execfile_ # ------------------------------------------------------------------------------ def loadConfig(namespace): @@ -48,7 +47,7 @@ def loadConfig(namespace): sys.stdout.write("load additional sphinx-config: %s\n" % config_file) config = namespace.copy() config['__file__'] = config_file - execfile_(config_file, config) + exec(config_file.read_text(), config) del config['__file__'] namespace.update(config) else: