Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/105730 _apply patch failure_ Submitter: Thomas Monjalon Date: Tuesday, January 11 2022 11:43:56 Applied on: CommitID:3f993907ee9d530bc595d973a5f764674fcaf509 Apply patch set 105730 failed: Checking patch buildtools/call-sphinx-build.py... error: while searching for: import os from os.path import join from subprocess import run, PIPE, STDOUT from distutils.version import StrictVersion # assign parameters to variables (sphinx, version, src, dst, *extra_args) = sys.argv[1:] error: patch failed: buildtools/call-sphinx-build.py:7 error: while searching for: ver = run([sphinx, '--version'], stdout=PIPE, stderr=STDOUT).stdout.decode().split()[-1] sphinx_cmd = [sphinx] + extra_args if StrictVersion(ver) >= StrictVersion('1.7'): sphinx_cmd += ['-j', 'auto'] # find all the files sphinx will process so we can write them as dependencies error: patch failed: buildtools/call-sphinx-build.py:19 Checking patch doc/guides/conf.py... error: while searching for: # Copyright(c) 2010-2015 Intel Corporation from docutils import nodes from distutils.version import LooseVersion from sphinx import __version__ as sphinx_version from os import listdir from os import environ error: patch failed: doc/guides/conf.py:3 error: while searching for: project = 'Data Plane Development Kit' html_logo = '../logo/DPDK_logo_vertical_rev_small.png' if LooseVersion(sphinx_version) >= LooseVersion('3.5'): html_permalinks = False else: html_add_permalinks = "" error: patch failed: doc/guides/conf.py:28 error: while searching for: 'Features availability for Timer adapters', 'Feature') if LooseVersion(sphinx_version) < LooseVersion('1.3.1'): print('Upgrade sphinx to version >= 1.3.1 for ' 'improved Figure/Table number handling.', file=stderr) error: patch failed: doc/guides/conf.py:427 Applying patch buildtools/call-sphinx-build.py with 2 rejects... Rejected hunk #1. Rejected hunk #2. Applying patch doc/guides/conf.py with 3 rejects... Rejected hunk #1. Rejected hunk #2. Rejected hunk #3. diff a/buildtools/call-sphinx-build.py b/buildtools/call-sphinx-build.py (rejected hunks) @@ -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 a/doc/guides/conf.py b/doc/guides/conf.py (rejected hunks) @@ -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) https://lab.dpdk.org/results/dashboard/patchsets/20636/ UNH-IOL DPDK Community Lab