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 9D487A0093 for ; Thu, 28 May 2020 18:25:08 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 870091DC27; Thu, 28 May 2020 18:25:08 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id 175F61DC2F for ; Thu, 28 May 2020 18:25:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9Kp5ocaTUg3T5rgqnQDykKaA5cBfwBZoaeZTYybB+a8=; b=HIccJxnnWUmJ/2w5G6kL3uw7sVr/ShVCZc6bXb+nKzwEjSkkJK5cnCEnXc6sC33NQewWi7 0+lRF1ysXHrKszqAAXBjERUESl4RyYNi9vKacfkxOioO/c5S5gwN2UzXF2JZUy079CBWE5 bPVwWSLar1uFDAeIRmd+u/dGKq2oYS8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-333-e_uGP5muOrKkSWB6zPPQYw-1; Thu, 28 May 2020 12:24:59 -0400 X-MC-Unique: e_uGP5muOrKkSWB6zPPQYw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8DC9418FE860; Thu, 28 May 2020 16:24:58 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id D420460C05; Thu, 28 May 2020 16:24:57 +0000 (UTC) From: Kevin Traynor To: Thomas Monjalon Cc: dpdk stable Date: Thu, 28 May 2020 17:22:18 +0100 Message-Id: <20200528162322.7863-31-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'doc: fix sphinx compatibility' has been queued to LTS release 18.11.9 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 LTS release 18.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/03/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/2f5fe24636a8cab5034ec80bc34e00676bcd30f7 Thanks. Kevin. --- >From 2f5fe24636a8cab5034ec80bc34e00676bcd30f7 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 2ebbf50c60..91b2f1153e 100644 --- a/doc/guides/conf.py +++ b/doc/guides/conf.py @@ -415,3 +415,7 @@ def setup(app): 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.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:00.768805638 +0100 +++ 0031-doc-fix-sphinx-compatibility.patch 2020-05-28 17:12:59.091556627 +0100 @@ -1 +1 @@ -From 10d34aa3dee8daf0a07ae152de8377942f63503b Mon Sep 17 00:00:00 2001 +From 2f5fe24636a8cab5034ec80bc34e00676bcd30f7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 10d34aa3dee8daf0a07ae152de8377942f63503b ] + @@ -10,2 +11,0 @@ -Cc: stable@dpdk.org - @@ -18 +18 @@ -index c368fa51d4..08dcfcff54 100644 +index 2ebbf50c60..91b2f1153e 100644 @@ -21 +21 @@ -@@ -416,3 +416,7 @@ def setup(app): +@@ -415,3 +415,7 @@ def setup(app):