Skip to content

Commit

Permalink
Trac sagemath#34730: Rebase sage_autodoc to sphinx 5.3.0
Browse files Browse the repository at this point in the history
We rebase `sage_autodoc` to Sphinx 5.3.0.

This is a step toward eventual removal of sage_autodoc in sagemath#30893, a
customization of Sphinx autodoc extension for Sage objects.

Other related tickets are sagemath#27578. sagemath#30884, sagemath#31309, in this regard.

URL: https://trac.sagemath.org/34730
Reported by: klee
Ticket author(s): Kwankyu Lee
Reviewer(s): Tobias Diez
  • Loading branch information
Release Manager committed Nov 15, 2022
2 parents 1df550e + aa74d4b commit b52855e
Show file tree
Hide file tree
Showing 8 changed files with 2,163 additions and 858 deletions.
6 changes: 3 additions & 3 deletions build/pkgs/configure/checksums.ini
@@ -1,4 +1,4 @@
tarball=configure-VERSION.tar.gz
sha1=e57f03eb961f3f03cbf3dd82220685359f0a905c
md5=d9b06acf2391303f44646df8d27db0a7
cksum=1194535207
sha1=d0ac37033390866cb25261e906a5d89893009e1b
md5=025f27345a627f6c966ca892f3cb8f9c
cksum=983804627
2 changes: 1 addition & 1 deletion build/pkgs/configure/package-version.txt
@@ -1 +1 @@
bd1485e4f57b6bc4eb624dcd1dc889fefc36d304
a74fc78822cb450592cbe86188a08ed719ecc597
2 changes: 1 addition & 1 deletion src/sage/combinat/root_system/cartan_type.py
Expand Up @@ -2025,7 +2025,7 @@ def classical(self):
We check that :meth:`classical`,
:meth:`sage.combinat.root_system.cartan_type.CartanType_crystallographic.dynkin_diagram`,
and :meth:`.special_node` are consistent::
and :meth:`special_node` are consistent::
sage: for ct in CartanType.samples(affine = True):
....: g1 = ct.classical().dynkin_diagram()
Expand Down
2 changes: 1 addition & 1 deletion src/sage/manifolds/manifold.py
Expand Up @@ -2206,7 +2206,7 @@ class options(GlobalOptions):
sage: M.options._reset()
"""
NAME = 'manifolds'
module = 'sage.manifolds'
module = 'sage.manifolds.manifold'
option_class = 'TopologicalManifold'
textbook_output = dict(default=True,
description='textbook-like output instead of the Pynac output for derivatives',
Expand Down
3 changes: 0 additions & 3 deletions src/sage/misc/sagedoc_conf.py
Expand Up @@ -146,9 +146,6 @@ def apply(self):
node.rawsource = source
node[:] = [nodes.Text(source)]

from sage.misc.sageinspect import sage_getargspec
autodoc_builtin_argspec = sage_getargspec

# This is only used by sage.misc.sphinxify
def setup(app):
app.connect('autodoc-process-docstring', process_docstring_cython)
Expand Down
6 changes: 3 additions & 3 deletions src/sage/rings/polynomial/laurent_polynomial.pyx
Expand Up @@ -3308,12 +3308,12 @@ cdef class LaurentPolynomial_mpair(LaurentPolynomial):
to variables supplied in args.
Multiple variables and iteration counts may be supplied; see
documentation for the global derivative() function for more
documentation for the global :func:`derivative` function for more
details.
.. SEEALSO::
:meth:`_derivative`
:meth:`_derivative`
EXAMPLES::
Expand All @@ -3336,7 +3336,7 @@ cdef class LaurentPolynomial_mpair(LaurentPolynomial):
respect to the given variable.
If var is among the generators of this ring, the derivative
is with respect to the generator. Otherwise, _derivative(var) is called
is with respect to the generator. Otherwise, ``_derivative(var)`` is called
recursively for each coefficient of this polynomial.
.. SEEALSO:: :meth:`derivative`
Expand Down
2 changes: 1 addition & 1 deletion src/sage/structure/global_options.py
Expand Up @@ -1390,7 +1390,7 @@ def __eq__(self, other):
sage: Partitions.options == Tableaux.options
False
"""
return self.__getstate__() == other.__getstate__()
return isinstance(other, GlobalOptions) and self.__getstate__() == other.__getstate__()

def _add_option(self, option, specifications):
r"""
Expand Down

0 comments on commit b52855e

Please sign in to comment.