d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

doc: replace deprecated distutils version parsing

Browse Source 
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>
Tested-by: Jerin Jacob <jerinj@marvell.com>
This commit is contained in:
Thomas Monjalon 2022-01-11 12:35:44 +01:00
parent 7be78d0279
commit 2654ce5c56
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildtools/call-sphinx-build.py
View File

@ -7,7 +7,7 @@
import os import os
from os.path import join from os.path import join
from subprocess import run, PIPE, STDOUT from subprocess import run, PIPE, STDOUT
from distutils.version import StrictVersion from packaging.version import Version
# assign parameters to variables # assign parameters to variables
(sphinx, version, src, dst, *extra_args) = sys.argv[1:] (sphinx, version, src, dst, *extra_args) = sys.argv[1:]
@ -19,7 +19,7 @@
ver = run([sphinx, '--version'], stdout=PIPE, ver = run([sphinx, '--version'], stdout=PIPE,
stderr=STDOUT).stdout.decode().split()[-1] stderr=STDOUT).stdout.decode().split()[-1]
sphinx_cmd = [sphinx] + extra_args sphinx_cmd = [sphinx] + extra_args
if StrictVersion(ver) >= StrictVersion('1.7'): if Version(ver) >= Version('1.7'):
sphinx_cmd += ['-j', 'auto'] sphinx_cmd += ['-j', 'auto']
# find all the files sphinx will process so we can write them as dependencies # find all the files sphinx will process so we can write them as dependencies

6
doc/guides/conf.py
View File

@ -3,7 +3,7 @@
# Copyright(c) 2010-2015 Intel Corporation # Copyright(c) 2010-2015 Intel Corporation
from docutils import nodes from docutils import nodes
from distutils.version import LooseVersion from packaging.version import Version
from sphinx import __version__ as sphinx_version from sphinx import __version__ as sphinx_version
from os import listdir from os import listdir
from os import environ from os import environ
@ -28,7 +28,7 @@
project = 'Data Plane Development Kit' project = 'Data Plane Development Kit'
html_logo = '../logo/DPDK_logo_vertical_rev_small.png' 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 html_permalinks = False
else: else:
html_add_permalinks = "" html_add_permalinks = ""
@ -427,7 +427,7 @@ def setup(app):
'Features availability for Timer adapters', 'Features availability for Timer adapters',
'Feature') '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 ' print('Upgrade sphinx to version >= 1.3.1 for '
'improved Figure/Table number handling.', 'improved Figure/Table number handling.',
file=stderr) file=stderr)