#18497: Update Sphinx to 1.4
-------------------------------------+-------------------------------------
Reporter: aapitzsch | Owner:
Type: enhancement | Status: needs_work
Priority: major | Milestone: sage-7.2
Component: packages: | Resolution:
standard | Merged in:
Keywords: python3 | Reviewers:
Authors: André Apitzsch, | Work issues:
Jeroen Demeyer | Commit:
Report Upstream: N/A | ba6c218334007974eb88427a9ba7a36b64361268
Branch: | Stopgaps:
u/jdemeyer/ticket/18497 |
Dependencies: #20359, #14840 |
-------------------------------------+-------------------------------------
Comment (by jhpalmieri):
I don't know the right fix, but I think the problem is in this line:
{{{
#!diff
diff --git a/src/sage_setup/docbuild/__init__.py
b/src/sage_setup/docbuild/__init__.py
index 6bfe38e..069c0a9 100644
--- a/src/sage_setup/docbuild/__init__.py
+++ b/src/sage_setup/docbuild/__init__.py
@@ -767,7 +767,7 @@ class ReferenceSubBuilder(DocBuilder):
env_pickle = os.path.join(self._doctrees_dir(),
'environment.pickle')
try:
- env = BuildEnvironment.frompickle(config, env_pickle)
+ env = BuildEnvironment.frompickle(self.dir, config,
env_pickle)
logger.debug("Opened Sphinx environment: %s", env_pickle)
return env
except IOError as err:
}}}
With this change I get other errors, one of which can be fixed like this:
{{{
#!diff
diff --git a/src/sage_setup/docbuild/ext/sage_autodoc.py
b/src/sage_setup/docbuild/ext/sage_autodoc.py
index 20f7168..e2073a5 100644
--- a/src/sage_setup/docbuild/ext/sage_autodoc.py
+++ b/src/sage_setup/docbuild/ext/sage_autodoc.py
@@ -38,7 +38,7 @@ from sphinx.application import ExtensionError
from sphinx.util.nodes import nested_parse_with_titles
from sphinx.util.compat import Directive
from sphinx.util.inspect import getargspec, isdescriptor,
safe_getmembers, \
- safe_getattr, safe_repr as sphinx_safe_repr, is_builtin_class_method
+ safe_getattr, object_description as sphinx_safe_repr,
is_builtin_class_method
from sphinx.util.pycompat import base_exception, class_types
from sphinx.util.docstrings import prepare_docstring
}}}
I don't know about the others, though.
--
Ticket URL: <http://trac.sagemath.org/ticket/18497#comment:41>
Sage <http://www.sagemath.org>
Sage: Creating a Viable Open Source Alternative to Magma, Maple, Mathematica,
and MATLAB
--
You received this message because you are subscribed to the Google Groups
"sage-trac" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
Visit this group at https://groups.google.com/group/sage-trac.
For more options, visit https://groups.google.com/d/optout.
