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 1D2D0A034E for ; Mon, 21 Feb 2022 16:37:15 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0CC784013F; Mon, 21 Feb 2022 16:37:15 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 09F5A4013F for ; Mon, 21 Feb 2022 16:37:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457832; 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=miIRxOF7vqjQBRBPoHSiJ5dwsvFkwCiQqdjk5l5R37c=; b=WYLbtoA/4hlAZzTnoO7ao5ndgqI+q0pzDmFDPK0LmEOWqNDJtFmzuH/GYS+yE1qmLVFDA7 KFrWhW0XUwgt3xQoTGXUpuI0UpVFaSDu6qcVTYIWMv1mZ0GRpYDZHeOfNXLZrLC6PEQ9Tk 1U9gGhv1Ba8NDSM9QPTRNb2Jp2d4g3c= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-48-2LKVjTREMM2B79YXwSbmbA-1; Mon, 21 Feb 2022 10:37:07 -0500 X-MC-Unique: 2LKVjTREMM2B79YXwSbmbA-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 5421F180FD64; Mon, 21 Feb 2022 15:37:06 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 48D387E131; Mon, 21 Feb 2022 15:37:05 +0000 (UTC) From: Kevin Traynor To: Thomas Monjalon Cc: Jerin Jacob , dpdk stable Subject: patch 'doc: replace deprecated distutils version parsing' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:33:11 +0000 Message-Id: <20220221153625.152324-2-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 21.11.1 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/26/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/b3122779a5d515380f174f6573be168e385ae95b Thanks. Kevin --- >From b3122779a5d515380f174f6573be168e385ae95b 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 @@ -8,5 +8,5 @@ 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 @@ -20,5 +20,5 @@ 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'] diff --git a/doc/guides/conf.py b/doc/guides/conf.py index 1743ce301f..a55ce38800 100644 --- a/doc/guides/conf.py +++ b/doc/guides/conf.py @@ -4,5 +4,5 @@ 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 @@ -29,5 +29,5 @@ 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: @@ -428,5 +428,5 @@ def setup(app): '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.', -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:44.757694178 +0000 +++ 0002-doc-replace-deprecated-distutils-version-parsing.patch 2022-02-21 15:22:44.033703995 +0000 @@ -1 +1 @@ -From 2654ce5c56a4c17a649550ba89fd9003f21eab5b Mon Sep 17 00:00:00 2001 +From b3122779a5d515380f174f6573be168e385ae95b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2654ce5c56a4c17a649550ba89fd9003f21eab5b ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org