From patchwork Tue Oct 6 15:56:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1377512 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=iTDsq+/F; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C5MY76h3zz9sSG for ; Wed, 7 Oct 2020 02:57:15 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 101CD806C5; Tue, 6 Oct 2020 17:57:12 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="iTDsq+/F"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4CDC381BD2; Tue, 6 Oct 2020 17:57:10 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 02DD080404 for ; Tue, 6 Oct 2020 17:57:07 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1601999827; bh=aJ22/zId0XfgJBua6Y4uiNJFHnrcxwRe30YHnc9fzl8=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=iTDsq+/FOjUYmN3YeCIssC7eVC3uR1+aOugATpwN+PmyY3ElTHfQX81Bl8wGGSDeq YojSs0vuZ4F1nb5SZTEfh9STA8RDVnPAEAL9W3ux+L2AULqBFVVu6/8wvhKFVSCIRS bL5WjpRq56MUIt+EwIcEOJrWfuPvFB1VGi2uWNZk= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from workstation4.fritz.box ([178.202.41.107]) by mail.gmx.com (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MdNcG-1kyt2R0B1M-00ZL0i; Tue, 06 Oct 2020 17:57:07 +0200 From: Heinrich Schuchardt To: Tom Rini Cc: u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH v2] doc: Sphinx.override_domain() deprecated Date: Tue, 6 Oct 2020 17:56:59 +0200 Message-Id: <20201006155659.29175-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:QadumwCEueQcBDSC7jILG+njpukz1UagC97T4tVQ/d7BPI2kZRh jG8hFPeReMZu6evy/wB/F3oOeE9JW6VaCn0tTM2wosnJiteT7d18AltZMiZspN9MUqvq714 DmXJS6FAVQKwhj6mnRgxZeGJQEky0mnyWoLnddU2mXYgxTSA1vVIgDA8FnSvvNQK4FaLu5K cNV7NjPVDbOq4hOef/j+w== X-UI-Out-Filterresults: notjunk:1;V03:K0:/Wf+acT4TYA=:Y0hhSpd/YyDlB94MlCm619 5pD+mhJvtaS9Fnm1X+udDpAhGUctaL3jaU6yKXvzgkWyrBltf+/FGlxhEVjBNdc/iduZiilWr QIgmprvIwM1Yc8jPklUvnpoTTiT6OFdU3uHVNLOtMDN02+6fiBmAaoEakI2H1jV5aJlOCGeIQ w0mtBwsNYIIQWhfmQQ5uie9VQI66VNDWqwe9fkz7+Dj6VADSxyeprH8CatdObK0b2+gVTCTUv u0IzhLL/lEKGcV40vDF7mfmkLzPKWhaA8dbl9Ilf0mkYQgc0yE/obF59HNx1xIttX9lO0J5Wv sefyQeb3kJclDd6lelOVVYqh3rlNWNr8/CZ293xOuk6cAOuqju5V2PHFi7UnQDFO31Z199C8I y0yE3cblIvZJBDowAnOITb6qcP+oO+nvjQb9ry9xm2ou+96hS/vQH7xyplbrKm+7JZl6rarwj Xpja2qhaQnndUoKeKJFHUaE9ZNMYsREA2+x9vR3EScMUeHoBKsc5yZuXsrFxS/CZ19IrCXW8V tsLau486EMdr4hlbX43up12bHbOHQvIUpEb7COgz6ikThgxUz1ju9MPOh3Wio6+RPhY52kv+b D/fBRdxcClhRjGViijjwN+fcbo8EWv4+ZUudkHk+pMs6UFPaYHBQ0q5YscDZ6rs+7YHrY7rwO 1eYiDwI30Y6r0X9rldFb8wtESOhv3lieDW++VFYWa9y/lHS+I+qZwusVeyUSSO2XebkbCpWE/ nAjd0F6JaLBd+qJ/0HkVFP7d411m8991AIVjf+6UC7YPRhqANtHba5dIHUHP82jienLuyOELM ViCGnBUgfWJD7xoZi5bYSSXbnKhnS9pGKLq2Fj40x4DTrNBXk2bAZJ58NFIoXOUpE2yk3Z8wj w19T23V0t2WMvWe+5BqMKj9MqRnDCv7IIEWS2o4G9fSvjYvGdGDrfUNz7X90/dWW82WqkoXe1 x3oYn0eznRFtau54mz9Zo+2J96ZrrgAaPMO8tAfbBc3h+NrERxOq8Mpj9RR/zEr3XpJNdyfau JQWuPR1elzJFs3inFifARJHuVFtZ1kQrhvXMp7hDYhe/7ePyomW0bbnIlqb6RKGCd1sSfBgLd NiQ/FXsp8MeSHqcdtOWNpSoHAxD01Tr73NiXyGOyzMYpHatxXBlOUBkLbOYqnk4Qa/QRApj1W wawUmgzVZC3ntYvsvLkeOmO/V4+afKrI0UrvXVxjc8CrhFcf0Qyp+io6TIIrrX0gyisI12OEy rs/B6C5fdUXGmrtmg9EcR59wq6pn1LNCJ/g6rmaMigbppq2nqHKH2rn1jSX9EgQsjN3phz6NE U+zy63qqktCd/X20Gzpg28XVM6Bw6Urps16qrkPAKwvXZiWNKzYXr4uV8mg7X89HdsipOVCbH BmGZ2Q9Ww+fIEE4SRBlUIxY0LpWf911W93/k0g6UMVXOKDQS5fhN2askNa8IJS8NNbITlmNqm 69/gL2TFODIRaTVeNm6eKWP/h4TY2aSbYfuTmYTofg7NXs73qt7FYF X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.3 at phobos.denx.de X-Virus-Status: Clean Sphinx.override_domain() is deprecated since Sphinx 1.8 and removed in Sphinx 3. Use Sphinx.add_domain(, override=True) instead. Signed-off-by: Heinrich Schuchardt --- v2: Ubuntu 18.04 still uses Sphinx 1.6.7 So use the same version check as Linux. --- doc/sphinx/cdomain.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.28.0 diff --git a/doc/sphinx/cdomain.py b/doc/sphinx/cdomain.py index cf13ff3a65..e0c762caa6 100644 --- a/doc/sphinx/cdomain.py +++ b/doc/sphinx/cdomain.py @@ -48,7 +48,10 @@ major, minor, patch = sphinx.version_info[:3] def setup(app): - app.override_domain(CDomain) + if (major == 1 and minor < 8): + app.override_domain(CDomain) + else: + app.add_domain(CDomain, override=True) return dict( version = __version__,