From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id ADAEEA034F;
Tue, 11 Jan 2022 12:44:09 +0100 (CET)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 3F5BE426DD;
Tue, 11 Jan 2022 12:44:09 +0100 (CET)
Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com
[64.147.123.24])
by mails.dpdk.org (Postfix) with ESMTP id B426D411AE;
Tue, 11 Jan 2022 12:44:07 +0100 (CET)
Received: from compute3.internal (compute3.nyi.internal [10.202.2.43])
by mailout.west.internal (Postfix) with ESMTP id 7B5CA320112B;
Tue, 11 Jan 2022 06:44:06 -0500 (EST)
Received: from mailfrontend2 ([10.202.2.163])
by compute3.internal (MEProxy); Tue, 11 Jan 2022 06:44:07 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h=
from:to:cc:subject:date:message-id:mime-version
:content-transfer-encoding; s=fm3; bh=5TzqIgCSEe8hfxA+YMedcREIr6
J/cPhlPQcqbamTiNQ=; b=OKACrQlAnoG4eC2I1y5QHriHRGKTec3B67NUccJsz7
mZ8SKzpeNLuy9hcjCEdKIMrqiqE5IgGjh8TqD4/wpAIZSbiYQzNbk3a0o9nz32fK
EY9D6xsAOaLD4LTxkfaxOsY4XSTgJS4ZqLxl0rCMQoF/2WZF0nr4vm+NCiC+bo9E
0jgHzXm6oqBxTzq/rkauZ+UrhauXB9gx4K5xkVl6l6u6YtMg5CRskXCX7CPrAzJ6
TLi7Un59S7BmXBikcLpbKyCOU/EHeS00JSkWiU9HwoVV70UJQxlAC14bwGCHYlyX
xjOlKsGxLKaJhCd7zz035JwQk9uvaIV5fUrXeyleddSQ==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
messagingengine.com; h=cc:content-transfer-encoding:date:from
:message-id:mime-version:subject:to:x-me-proxy:x-me-proxy
:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=5TzqIgCSEe8hfxA+Y
MedcREIr6J/cPhlPQcqbamTiNQ=; b=Ro/crUuBWgMDhCF65S3jCT35NCb1n33Xi
/bzLOUA9QcGAzkKEBtoQx6/INnqjIXzHTb4Mkb5Z3AaSqzxsbq1lf0kIoooxKF5G
ws3DuBQTDnCBPeqkGwSj/TgEd1hELkHzfZfVVUD9mZK2nMnRC5psH2OQFFm6hQrs
S3bY4GHDQP25YJCHvAqJLysMxVRELbnIfNHGSwYXoKIhMSM4Iv0sLNsXFSZpDrqP
gLM8qY6uhereE00dHlNMpC8pnSmhKe/Rir273PczU1eiYm7zQ7luEO3IW8uEK+k3
4iWlniqK6lV+Wrvf+QVZhs7eTjPMFijU6v7IifeAQvPQSgWuQ+ffg==
X-ME-Sender: <xms:hW3dYc5yf6npnUJppdBtW4iktC4pqOYXfnFuwtNnseTNsaTFiMvwTw>
<xme:hW3dYd4RR25uk6tsglRdePs9qnZ49RR9nfWiWaJlHgKvWbxlWKBzCE5NA36A76Kx6
Fq-GdJxT2LD7yN5Bw>
X-ME-Received: <xmr:hW3dYbdnWMKDo5C-6GeygHoHrMF3xGHp3AeluM6BYNgSzECsCTdnP_3B5SPKX58J_CRUhJiUnnFM60xO1H3Ba-sKnDy_R4o>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddrudehfedgfedvucetufdoteggodetrfdotf
fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen
uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne
cujfgurhephffvufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgrshcu
ofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecuggftrf
grthhtvghrnhepvdelvdduhedvudduveeuvdevheegudelgeeigfejheduhedttdegudff
jeeihffgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomh
epthhhohhmrghssehmohhnjhgrlhhonhdrnhgvth
X-ME-Proxy: <xmx:hW3dYRL_acCeHglv73jNPx-7Z_ltu5Gzr5-knwo3NuXyI5nv9s76zA>
<xmx:hW3dYQKLJyWfD4ibt4CC0FLcQ9cVgKThn9t7fERDPIoh-eFQPvkvkg>
<xmx:hW3dYSyYeLuwZPA2Aih938_SPeQnftmd-r4DHIZY2YxZL03PpbeO6g>
<xmx:hm3dYXU2hGvDyEZpgHpf76Yr5UiU4cNH3UNMtc-YRse8JdFmTESi1A>
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue,
11 Jan 2022 06:44:04 -0500 (EST)
From: Thomas Monjalon <thomas@monjalon.net>
To: dev@dpdk.org
Cc: stable@dpdk.org, Jerin Jacob <jerinj@marvell.com>,
Bruce Richardson <bruce.richardson@intel.com>
Subject: [PATCH] doc: replace deprecated distutils version parsing
Date: Tue, 11 Jan 2022 12:43:56 +0100
Message-Id: <20220111114356.893127-1-thomas@monjalon.net>
X-Mailer: git-send-email 2.34.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
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
Cc: stable@dpdk.org
Reported-by: Jerin Jacob <jerinj@marvell.com>
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
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 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 @@
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 1743ce301f..a55ce38800 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 @@
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 = ""
@@ -427,7 +427,7 @@ def setup(app):
'Features availability for Timer adapters',
'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.34.1