From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6B9D9A0093 for ; Tue, 19 May 2020 15:00:32 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id ACCF91D633; Tue, 19 May 2020 15:00:27 +0200 (CEST) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id F2A041D5DE for ; Tue, 19 May 2020 15:00:24 +0200 (CEST) Received: by mail-wm1-f66.google.com with SMTP id z72so3462271wmc.2 for ; Tue, 19 May 2020 06:00:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/3RJylmItE746rT52wKDpZTxb0X14iM4pqdfwpNxBjQ=; b=qZG0AppF1kSig2MPymPoLpPTu9cukLEu9rq5wL8z+33BXA03CgPhd7OMEVik398i8o FIcaC08t3wLvV0z+I8iggb2rxaIT0eC4oGQrIJe4BZjAgWiCuvV7g0v7AR38LITf9SCq 2af5NXEEomU+UhaX8oZdN6sWTfHU2Nd7iLQ4B9D03qI9k3gYehiEcqjoIjEbn9tjf2O7 BekvFz+7U7YGLyxWsdDGgjhMHfOWC3giHvga/EAGa/pHhNvjLRLRsljVw2Exte6FmuIL jkAOGG1l6ZKmkD80yZ/AhPIcpp6bUYo4y2iji6uvOfNBhtUqeN4pyJQwpzMYRCumXWMO zaqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/3RJylmItE746rT52wKDpZTxb0X14iM4pqdfwpNxBjQ=; b=NoNw9zD/quymXvAc5BICI1WrH8l6b7rBVv52o8kjwPT6+qPOY39dRy+mGO1alSkDds JJLgMAV9KRXSCMAdNeMErVz/SbWxW5n7+wsnmFr8JLqSk2kravU8//GROW22BtE5Edq7 tDLI3qSNTfhbWa5oId7TrbfQ4al6lLV91k/NIDRc2ua0HY/6mh8eCA9Sh3AnFjRnFZcS 5/sDm15chSAIr39IjhXQv+ITk6jBrjxFja7Xk4A5U8MRV2hABfLazc91yTXkNksz6z+Y BzLAFkW8erb1yABHY39aFObJ/Gy1in5/Q5MC36Dl7vMWnvne9UOwOmoQ7F1zh0gLpkTi P4+g== X-Gm-Message-State: AOAM532B+eKLPO2EUA32RaYe84N7/pFA8pLmM9kq7y6qjnKAhNHdSTU4 /bcuJrL8tadNciMydqitglUvpr4Y/niFsLlL X-Google-Smtp-Source: ABdhPJw5PjNq1yP37qawccdpis2PXEC6oqQ0r0T4dtkd66sZCRP2PPVAAYxn4juxauiP72F7lkzyfQ== X-Received: by 2002:a1c:408:: with SMTP id 8mr5046185wme.147.1589893224735; Tue, 19 May 2020 06:00:24 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id a13sm20316779wrv.67.2020.05.19.06.00.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:00:24 -0700 (PDT) From: luca.boccassi@gmail.com To: Thomas Monjalon Cc: dpdk stable Date: Tue, 19 May 2020 13:54:18 +0100 Message-Id: <20200519125804.104349-68-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519125804.104349-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'doc: fix sphinx compatibility' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From c4d52beff82ecca2211c99f9043e0a38f30b1ce0 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Wed, 8 Apr 2020 10:09:23 +0200 Subject: [PATCH] doc: fix sphinx compatibility [ upstream commit 10d34aa3dee8daf0a07ae152de8377942f63503b ] The function add_stylesheet() is deprecated since sphinx 1.8. It will be removed in sphinx 4.0. It is replaced by add_css_file(). Signed-off-by: Thomas Monjalon --- doc/guides/conf.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/guides/conf.py b/doc/guides/conf.py index 0892c06dec..797ad1ef4b 100644 --- a/doc/guides/conf.py +++ b/doc/guides/conf.py @@ -410,4 +410,8 @@ def setup(app): # Process the numref references once the doctree has been created. app.connect('doctree-resolved', process_numref) - app.add_stylesheet('css/custom.css') + try: + # New function in sphinx 1.8 + app.add_css_file('css/custom.css') + except: + app.add_stylesheet('css/custom.css') -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 13:56:21.582247157 +0100 +++ 0068-doc-fix-sphinx-compatibility.patch 2020-05-19 13:56:18.299503260 +0100 @@ -1,24 +1,24 @@ -From 10d34aa3dee8daf0a07ae152de8377942f63503b Mon Sep 17 00:00:00 2001 +From c4d52beff82ecca2211c99f9043e0a38f30b1ce0 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Wed, 8 Apr 2020 10:09:23 +0200 Subject: [PATCH] doc: fix sphinx compatibility +[ upstream commit 10d34aa3dee8daf0a07ae152de8377942f63503b ] + The function add_stylesheet() is deprecated since sphinx 1.8. It will be removed in sphinx 4.0. It is replaced by add_css_file(). -Cc: stable@dpdk.org - Signed-off-by: Thomas Monjalon --- doc/guides/conf.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/guides/conf.py b/doc/guides/conf.py -index c368fa51d4..08dcfcff54 100644 +index 0892c06dec..797ad1ef4b 100644 --- a/doc/guides/conf.py +++ b/doc/guides/conf.py -@@ -415,4 +415,8 @@ def setup(app): +@@ -410,4 +410,8 @@ def setup(app): # Process the numref references once the doctree has been created. app.connect('doctree-resolved', process_numref)