From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 14E23A0032 for ; Fri, 18 Feb 2022 13:39:42 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0F71C40141; Fri, 18 Feb 2022 13:39:42 +0100 (CET) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mails.dpdk.org (Postfix) with ESMTP id 2864E40141 for ; Fri, 18 Feb 2022 13:39:41 +0100 (CET) Received: by mail-wm1-f44.google.com with SMTP id c192so5154807wma.4 for ; Fri, 18 Feb 2022 04:39:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/eMzly0tT+OwRn3qRx+ST8q6wAwlgzXeDOFMxfyxSTM=; b=kvAGjzKNZGQWHH2HGXz9IAaqbSj0XVqpyBjUEOAd5N5x9nWzKGbfSEIzfcRFndKN1F LJ2gR/P9F8ht44D6Qr53dw2Pl/E/mryfVKi/ScNC9LcrVH6UsOarn0iFg4atJnxQ/QCW fI+ZmTLUDYHhQg1xww7rgl/yuBe550oWuuOIirAQw+xo8uvRtMtL4SbIBJ5VX10QE3gp WuMx5cq45aSRcExuqaSL2YnE1j9CtmLwMJHKlkL4FaGwSGAqnV/aOyyzvEz3H+NOFdUK e1zna31klszGUo3PykrFMS56OQSgPqNnIPQ6qkiJoDy2sktJn37hcBNTUOibnP3scNn3 L6Rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/eMzly0tT+OwRn3qRx+ST8q6wAwlgzXeDOFMxfyxSTM=; b=1VyeAKHnImOaaPRleV01FRwWGG6Hv6oPj3cy707uh0DC0kd1ZdGb9zM4qIFwA1fCq/ SPjisunZLAUYpiSV7g7iGW6CN55S+SvW6R5noFcnmIMBQt8CSlctzAyW2dYXw03bJ4l/ /NW6m2TDf7d0oOqdu9Xvmj9IL/lniTm6BZlHjz8W2+8mnhb9vaDJqVUIuIiJfJmWc0sd Umt5ZGkmKb9Ufb4xvUw68o2OyVLAyGLolwOtNpo2I1cbv7AojE1XQ/WRfYnhYnH/pp0z Sp3RfuW+YIe48qTUEYT8gqkXrCObGlEGmclmtSXltrs8qnuRO02ycqs0mdadqSrkijd/ DntA== X-Gm-Message-State: AOAM533bEyGzyaoST3g5acgVptSIQu9LmS+nfP3wreVAFgaLDwIpZ4uH tGarUyZZ3O7DlNKxqX3G87g= X-Google-Smtp-Source: ABdhPJyl0Om8ejrxoduaGYq5oeqGfnO+f3XODLgmPsZXK5nOwV2FhwOWrleXqEJplyGihq0f7+mOTw== X-Received: by 2002:a05:600c:3223:b0:37c:714:a0b6 with SMTP id r35-20020a05600c322300b0037c0714a0b6mr6981831wmp.5.1645187980716; Fri, 18 Feb 2022 04:39:40 -0800 (PST) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id j6sm29353697wrt.70.2022.02.18.04.39.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:39:40 -0800 (PST) From: luca.boccassi@gmail.com To: Thomas Monjalon Cc: Jerin Jacob , dpdk stable Subject: patch 'doc: replace deprecated distutils version parsing' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:37:31 +0000 Message-Id: <20220218123931.1749595-2-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 20.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/20/22. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/269489433cd49b15aeaba475c9f836c04dd6084f Thanks. Luca Boccassi --- >From 269489433cd49b15aeaba475c9f836c04dd6084f Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Tue, 11 Jan 2022 12:35:44 +0100 Subject: [PATCH] doc: replace deprecated distutils version parsing [ upstream commit 2654ce5c56a4c17a649550ba89fd9003f21eab5b ] When using Python 3.10, this warning appears: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives The PEP 632 recommends replacing "distutils.version" with "packaging". Bugzilla ID: 914 Reported-by: Jerin Jacob Signed-off-by: Thomas Monjalon Tested-by: Jerin Jacob --- buildtools/call-sphinx-build.py | 4 ++-- doc/guides/conf.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildtools/call-sphinx-build.py b/buildtools/call-sphinx-build.py index 26b199220a..39a60d09fa 100755 --- a/buildtools/call-sphinx-build.py +++ b/buildtools/call-sphinx-build.py @@ -7,7 +7,7 @@ import sys import os from os.path import join from subprocess import run, PIPE, STDOUT -from distutils.version import StrictVersion +from packaging.version import Version # assign parameters to variables (sphinx, version, src, dst, *extra_args) = sys.argv[1:] @@ -19,7 +19,7 @@ os.environ['DPDK_VERSION'] = version ver = run([sphinx, '--version'], stdout=PIPE, stderr=STDOUT).stdout.decode().split()[-1] sphinx_cmd = [sphinx] + extra_args -if StrictVersion(ver) >= StrictVersion('1.7'): +if Version(ver) >= Version('1.7'): sphinx_cmd += ['-j', 'auto'] # find all the files sphinx will process so we can write them as dependencies diff --git a/doc/guides/conf.py b/doc/guides/conf.py index 894d81ca75..8379c53d7c 100644 --- a/doc/guides/conf.py +++ b/doc/guides/conf.py @@ -3,7 +3,7 @@ # Copyright(c) 2010-2015 Intel Corporation from docutils import nodes -from distutils.version import LooseVersion +from packaging.version import Version from sphinx import __version__ as sphinx_version from os import listdir from os import environ @@ -28,7 +28,7 @@ stop_on_error = ('-W' in argv) project = 'Data Plane Development Kit' html_logo = '../logo/DPDK_logo_vertical_rev_small.png' -if LooseVersion(sphinx_version) >= LooseVersion('3.5'): +if Version(sphinx_version) >= Version('3.5'): html_permalinks = False else: html_add_permalinks = "" @@ -385,7 +385,7 @@ def setup(app): 'Features availability in bbdev drivers', 'Feature') - if LooseVersion(sphinx_version) < LooseVersion('1.3.1'): + if Version(sphinx_version) < Version('1.3.1'): print('Upgrade sphinx to version >= 1.3.1 for ' 'improved Figure/Table number handling.', file=stderr) -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:38.331715563 +0000 +++ 0002-doc-replace-deprecated-distutils-version-parsing.patch 2022-02-18 12:37:37.498787632 +0000 @@ -1 +1 @@ -From 2654ce5c56a4c17a649550ba89fd9003f21eab5b Mon Sep 17 00:00:00 2001 +From 269489433cd49b15aeaba475c9f836c04dd6084f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2654ce5c56a4c17a649550ba89fd9003f21eab5b ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -47 +48 @@ -index 1743ce301f..a55ce38800 100644 +index 894d81ca75..8379c53d7c 100644 @@ -68,2 +69,2 @@ -@@ -427,7 +427,7 @@ def setup(app): - 'Features availability for Timer adapters', +@@ -385,7 +385,7 @@ def setup(app): + 'Features availability in bbdev drivers',