| 0 | |
Description: Fix build error with sphinx 4.
|
|
0 |
Description: Updates doc generation config for Python 3 compatibility
|
|
1 |
Fixes build error with sphinx 4.
|
| 1 | 2 |
cd /dev/shm/VIGRA/libvigraimpex-1.11.1/obj.x86_64-linux-gnu/vigranumpy/docsrc && /usr/bin/sphinx-build -b html -d /dev/shm/VIGRA/libvigraimpex-1.11.1/doc/vigranumpy/doctrees -D latex_paper_size=a4 -c /dev/shm/VIGRA/libvigraimpex-1.11.1/obj.x86_64-linux-gnu/vigranumpy/docsrc /dev/shm/VIGRA/libvigraimpex-1.11.1/vigranumpy/docsrc /dev/shm/VIGRA/libvigraimpex-1.11.1/doc/vigranumpy
|
| 2 | 3 |
Running Sphinx v4.2.0
|
| 3 | 4 |
.
|
| 4 | 5 |
Configuration error:
|
| 5 | 6 |
There is a syntax error in your configuration file: invalid syntax (conf.py, line 25)
|
| 6 | |
Author: Andreas Metzler <ametzler@debian.org>
|
|
7 |
Author: Omari Stephens <xsdg@xsdg.org>
|
| 7 | 8 |
Origin: vendor
|
| 8 | 9 |
Forwarded: https://github.com/ukoethe/vigra/issues/502
|
| 9 | |
Last-Update: 2021-10-16
|
|
10 |
Last-Update: 2021-12-28
|
| 10 | 11 |
|
| 11 | |
--- libvigraimpex-1.11.1+dfsg.orig/vigranumpy/docsrc/conf.py.in
|
| 12 | |
+++ libvigraimpex-1.11.1+dfsg/vigranumpy/docsrc/conf.py.in
|
| 13 | |
@@ -14,23 +14,6 @@
|
| 14 | |
from __future__ import division, print_function
|
| 15 | |
import sys, os, re
|
| 16 | |
|
| 17 | |
-# silent lots of 'arg is not a Python function' warnings
|
| 18 | |
-import inspect
|
| 19 | |
-
|
| 20 | |
-_original_getargspec = inspect.getargspec
|
| 21 | |
-
|
| 22 | |
-def _getargspec_workaround(*args, **kw):
|
| 23 | |
- try:
|
| 24 | |
- return _original_getargspec(*args, **kw)
|
|
12 |
---
|
|
13 |
vigranumpy/docsrc/conf.py.cmake2.in | 2 +-
|
|
14 |
vigranumpy/docsrc/conf.py.in | 2 +-
|
|
15 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
16 |
|
|
17 |
diff --git a/vigranumpy/docsrc/conf.py.cmake2.in b/vigranumpy/docsrc/conf.py.cmake2.in
|
|
18 |
index e4266a6..175dfb3 100644
|
|
19 |
--- a/vigranumpy/docsrc/conf.py.cmake2.in
|
|
20 |
+++ b/vigranumpy/docsrc/conf.py.cmake2.in
|
|
21 |
@@ -23,7 +23,7 @@ _original_getargspec = inspect.getargspec
|
|
22 |
def _getargspec_workaround(*args, **kw):
|
|
23 |
try:
|
|
24 |
return _original_getargspec(*args, **kw)
|
| 25 | 25 |
- except TypeError, e:
|
| 26 | |
- if str(e).startswith('arg is not a Python function'):
|
| 27 | |
- return inspect.ArgSpec([], None, None, None)
|
| 28 | |
- else:
|
| 29 | |
- raise
|
| 30 | |
-
|
| 31 | |
-inspect.getargspec = _getargspec_workaround
|
| 32 | |
-_getargspec_workaround.__module__ = 'inspect'
|
| 33 | |
-
|
| 34 | |
# set the PATH of the current build, so that we don't create
|
| 35 | |
# documentation for a possibly outdated installation
|
| 36 | |
vigranumpy_path=r'@VIGRANUMPY_TMP_PATH@'
|
|
26 |
+ except TypeError as e:
|
|
27 |
if str(e).startswith('arg is not a Python function'):
|
|
28 |
return inspect.ArgSpec([], None, None, None)
|
|
29 |
else:
|
|
30 |
diff --git a/vigranumpy/docsrc/conf.py.in b/vigranumpy/docsrc/conf.py.in
|
|
31 |
index 6075593..ac2261d 100644
|
|
32 |
--- a/vigranumpy/docsrc/conf.py.in
|
|
33 |
+++ b/vigranumpy/docsrc/conf.py.in
|
|
34 |
@@ -22,7 +22,7 @@ _original_getargspec = inspect.getargspec
|
|
35 |
def _getargspec_workaround(*args, **kw):
|
|
36 |
try:
|
|
37 |
return _original_getargspec(*args, **kw)
|
|
38 |
- except TypeError, e:
|
|
39 |
+ except TypeError as e:
|
|
40 |
if str(e).startswith('arg is not a Python function'):
|
|
41 |
return inspect.ArgSpec([], None, None, None)
|
|
42 |
else:
|
|
43 |
--
|
|
44 |
2.15.0
|
|
45 |
|