From d258e4913aeb5225b8dd253ce63ac6b52f588a08 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Mon, 9 Dec 2019 10:29:20 +0100 Subject: [PATCH 01/23] Make docbuild merging compatible with spinx 2.1 The attributes "todo_all_todos" and "citations" were previously implicitly initialized by sphinx. That changed in sphinx 2.1 due to some refactoring: https://github.com/sphinx-doc/sphinx/commit/9abb4820b18201f63d77fdccb4ef394a21442f7a https://github.com/sphinx-doc/sphinx/commit/885d35e374b56d1d17f5036fe07b74229cdbec7f So now we need to check for the case where they are not initialized yet. We can't actually update to sphinx 2.1 yet, since its python3 only. This is mostly intended to make things easier for distros and allow us to update in the future. --- src/sage_setup/docbuild/ext/multidocs.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/sage_setup/docbuild/ext/multidocs.py b/src/sage_setup/docbuild/ext/multidocs.py index 71a08cd9379..3a3d09ab591 100644 --- a/src/sage_setup/docbuild/ext/multidocs.py +++ b/src/sage_setup/docbuild/ext/multidocs.py @@ -47,24 +47,30 @@ def merge_environment(app, env): - domaindata['py']['modules'] # list of python modules """ logger.info(bold('Merging environment/index files...')) + if not hasattr(env, "todo_all_todos"): + env.todo_all_todos = [] + if not hasattr(env.domaindata["std"], "citations"): + env.domaindata["std"]["citations"] = dict() for curdoc in app.env.config.multidocs_subdoc_list: logger.info(" %s:"%curdoc, nonl=1) docenv = get_env(app, curdoc) if docenv is not None: fixpath = lambda path: os.path.join(curdoc, path) + todos = docenv.todo_all_todos if hasattr(docenv, "todo_all_todos") else [] + citations = docenv.domaindata["std"].get("citations", dict()) logger.info(" %s todos, %s index, %s citations"%( - len(docenv.todo_all_todos), + len(todos), len(docenv.indexentries), - len(docenv.domaindata["std"]["citations"]) + len(citations) ), nonl=1) # merge titles for t in docenv.titles: env.titles[fixpath(t)] = docenv.titles[t] # merge the todo links - for dct in docenv.todo_all_todos: + for dct in todos: dct['docname'] = fixpath(dct['docname']) - env.todo_all_todos += docenv.todo_all_todos + env.todo_all_todos += todos # merge the html index links newindex = {} for ind in docenv.indexentries: @@ -86,8 +92,7 @@ def merge_environment(app, env): env.metadata[ind] = md # merge the citations newcite = {} - citations = docenv.domaindata["std"]["citations"] - for ind, (path, tag, lineno) in six.iteritems(docenv.domaindata["std"]["citations"]): + for ind, (path, tag, lineno) in six.iteritems(citations): # TODO: Warn on conflicts newcite[ind] = (fixpath(path), tag, lineno) env.domaindata["std"]["citations"].update(newcite) @@ -253,7 +258,7 @@ def fetch_citation(app, env): with open(filename, 'rb') as f: cache = cPickle.load(f) logger.info("done (%s citations)."%len(cache)) - cite = env.domaindata["std"]["citations"] + cite = env.domaindata["std"].get("citations", dict()) for ind, (path, tag, lineno) in six.iteritems(cache): if ind not in cite: # don't override local citation cite[ind] = (os.path.join("..", path), tag, lineno) From ba588dafd926fe9d6d42950d9047e0fdabf6f4cf Mon Sep 17 00:00:00 2001 From: Antonio Rojas Date: Sun, 19 Apr 2020 12:01:46 +0200 Subject: [PATCH 02/23] Normalize intersphinx mappings --- src/sage/docs/conf.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/sage/docs/conf.py b/src/sage/docs/conf.py index a1212f5839d..a420990abba 100644 --- a/src/sage/docs/conf.py +++ b/src/sage/docs/conf.py @@ -8,6 +8,7 @@ from docutils.transforms import Transform from sphinx.ext.doctest import blankline_re from sphinx import highlighting +import sphinx.ext.intersphinx as intersphinx from IPython.lib.lexers import IPythonConsoleLexer, IPyLexer # If your extensions are in another directory, add it here. @@ -173,13 +174,8 @@ def sphinx_plot(graphics, **kwds): # Cross-links to other project's online documentation. python_version = sys.version_info.major -intersphinx_mapping = { - 'python': ('https://docs.python.org/', - os.path.join(SAGE_DOC_SRC, "common", - "python{}.inv".format(python_version))), - 'pplpy': (PPLPY_DOCS, None)} -def set_intersphinx_mappings(app): +def set_intersphinx_mappings(app, config): """ Add precompiled inventory (the objects.inv) """ @@ -190,7 +186,11 @@ def set_intersphinx_mappings(app): app.config.intersphinx_mapping = {} return - app.config.intersphinx_mapping = intersphinx_mapping + app.config.intersphinx_mapping = { + 'python': ('https://docs.python.org/', + os.path.join(SAGE_DOC_SRC, "common", + "python{}.inv".format(python_version))), + 'pplpy': (PPLPY_DOCS, None)} # Add master intersphinx mapping dst = os.path.join(invpath, 'objects.inv') @@ -205,6 +205,7 @@ def set_intersphinx_mappings(app): dst = os.path.join(invpath, directory, 'objects.inv') app.config.intersphinx_mapping[src] = dst + intersphinx.normalize_intersphinx_mapping(app, config) # By default document are not master. multidocs_is_master = True @@ -673,7 +674,7 @@ def call_intersphinx(app, env, node, contnode): """ debug_inf(app, "???? Trying intersphinx for %s" % node['reftarget']) builder = app.builder - res = sphinx.ext.intersphinx.missing_reference( + res = intersphinx.missing_reference( app, env, node, contnode) if res: # Replace absolute links to $SAGE_DOC by relative links: this @@ -856,11 +857,10 @@ def setup(app): if app.srcdir.startswith(SAGE_DOC_SRC): app.add_config_value('intersphinx_mapping', {}, False) app.add_config_value('intersphinx_cache_limit', 5, False) + app.connect('config-inited', set_intersphinx_mappings) + app.connect('builder-inited', intersphinx.load_mappings) # We do *not* fully initialize intersphinx since we call it by hand # in find_sage_dangling_links. # app.connect('missing-reference', missing_reference) app.connect('missing-reference', find_sage_dangling_links) - import sphinx.ext.intersphinx - app.connect('builder-inited', set_intersphinx_mappings) - app.connect('builder-inited', sphinx.ext.intersphinx.load_mappings) app.connect('builder-inited', nitpick_patch_config) From 36da5ea59c5a9abb532d3b2f9133ab6b1eeb679b Mon Sep 17 00:00:00 2001 From: Antonio Rojas Date: Sun, 19 Apr 2020 12:07:05 +0200 Subject: [PATCH 03/23] Update sphinx to 3.0.1 --- build/pkgs/sphinx/checksums.ini | 6 +++--- build/pkgs/sphinx/package-version.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/pkgs/sphinx/checksums.ini b/build/pkgs/sphinx/checksums.ini index ef7a4b12849..b2eb3e430b5 100644 --- a/build/pkgs/sphinx/checksums.ini +++ b/build/pkgs/sphinx/checksums.ini @@ -1,4 +1,4 @@ tarball=Sphinx-VERSION.tar.gz -sha1=93e715cb5d16d981698caa2d54b3b58596798f5d -md5=554f7a4e752f48b2601e5ef5ab463346 -cksum=2134440192 +sha1=dd040aedbef765189c6a502c4031df023ae51f46 +md5=111982b6ca04130d4e512f59b2e4402f +cksum=4119668724 diff --git a/build/pkgs/sphinx/package-version.txt b/build/pkgs/sphinx/package-version.txt index 991e538f58c..a7590f238f1 100644 --- a/build/pkgs/sphinx/package-version.txt +++ b/build/pkgs/sphinx/package-version.txt @@ -1 +1 @@ -1.8.5.p0 +3.0.1.p0 From 6aea5008564c47a05489b00d6c6c0d7a79535e50 Mon Sep 17 00:00:00 2001 From: Antonio Rojas Date: Sun, 19 Apr 2020 12:08:15 +0200 Subject: [PATCH 04/23] Fix deprecation warnings with sphinx 3 --- src/sage_setup/docbuild/ext/sage_autodoc.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/sage_setup/docbuild/ext/sage_autodoc.py b/src/sage_setup/docbuild/ext/sage_autodoc.py index bba274fe359..179fc25d0e1 100644 --- a/src/sage_setup/docbuild/ext/sage_autodoc.py +++ b/src/sage_setup/docbuild/ext/sage_autodoc.py @@ -35,14 +35,15 @@ from docutils.statemachine import ViewList import sphinx -from sphinx.ext.autodoc.importer import mock, import_object, get_object_members +from sphinx.ext.autodoc import mock +from sphinx.ext.autodoc.importer import import_object, get_object_members, get_module_members from sphinx.locale import _, __ from sphinx.pycode import ModuleAnalyzer from sphinx.errors import PycodeError from sphinx.util import logging from sphinx.util import rpartition, force_decode from sphinx.util.docstrings import prepare_docstring -from sphinx.util.inspect import isdescriptor, safe_getmembers, \ +from sphinx.util.inspect import isdescriptor, \ safe_getattr, object_description, is_builtin_class_method, \ isenumattribute, isclassmethod, isstaticmethod, getdoc @@ -536,7 +537,7 @@ def add_content(self, more_content, no_docstring=False): # add content from docstrings if not no_docstring: - encoding = self.analyzer and self.analyzer.encoding + encoding = self.analyzer and self.analyzer._encoding docstrings = self.get_doc(encoding) if not docstrings: # append at least a dummy docstring, so that the event @@ -882,7 +883,7 @@ def get_object_members(self, want_all): if not hasattr(self.object, '__all__'): # for implicit module members, check __module__ to avoid # documenting imported objects - return True, safe_getmembers(self.object) + return True, get_module_members(self.object) else: memberlist = self.object.__all__ # Sometimes __all__ is broken... @@ -893,7 +894,7 @@ def get_object_members(self, want_all): '(in module %s) -- ignoring __all__' % (memberlist, self.fullname)) # fall back to all members - return True, safe_getmembers(self.object) + return True, get_module_members(self.object) else: memberlist = self.options.members or [] ret = [] From 0f9d4a8e7bbd5d1b086fe0147a58721aaf471a4c Mon Sep 17 00:00:00 2001 From: Antonio Rojas Date: Sun, 19 Apr 2020 12:09:29 +0200 Subject: [PATCH 05/23] Port away from BuildEnvironment.frompickle, removed in sphinx 3 --- src/sage_setup/docbuild/__init__.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/sage_setup/docbuild/__init__.py b/src/sage_setup/docbuild/__init__.py index 128117b960f..5aad13c8c5b 100644 --- a/src/sage_setup/docbuild/__init__.py +++ b/src/sage_setup/docbuild/__init__.py @@ -817,9 +817,13 @@ def __init__(self, dir): env_pickle = os.path.join(self._doctrees_dir(), 'environment.pickle') try: - env = BuildEnvironment.frompickle(env_pickle, FakeApp(self.dir)) - logger.debug("Opened Sphinx environment: %s", env_pickle) - return env + with open(env_pickle, 'rb') as f: + import pickle + env = pickle.load(f) + env.app = FakeApp(self.dir) + env.config.values = env.app.config.values + logger.debug("Opened Sphinx environment: %s", env_pickle) + return env except IOError as err: logger.debug("Failed to open Sphinx environment: %s", err) From e83a8dde2c0f820751afedf89f69aa659cecb081 Mon Sep 17 00:00:00 2001 From: Antonio Rojas Date: Sun, 19 Apr 2020 12:13:41 +0200 Subject: [PATCH 06/23] Use correct citation domain --- src/sage_setup/docbuild/ext/multidocs.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/sage_setup/docbuild/ext/multidocs.py b/src/sage_setup/docbuild/ext/multidocs.py index 3a3d09ab591..d5426c346a1 100644 --- a/src/sage_setup/docbuild/ext/multidocs.py +++ b/src/sage_setup/docbuild/ext/multidocs.py @@ -49,15 +49,15 @@ def merge_environment(app, env): logger.info(bold('Merging environment/index files...')) if not hasattr(env, "todo_all_todos"): env.todo_all_todos = [] - if not hasattr(env.domaindata["std"], "citations"): - env.domaindata["std"]["citations"] = dict() + if not env.domaindata['citation'].get('citations'): + env.domaindata['citation']['citations'] = dict() for curdoc in app.env.config.multidocs_subdoc_list: logger.info(" %s:"%curdoc, nonl=1) docenv = get_env(app, curdoc) if docenv is not None: fixpath = lambda path: os.path.join(curdoc, path) todos = docenv.todo_all_todos if hasattr(docenv, "todo_all_todos") else [] - citations = docenv.domaindata["std"].get("citations", dict()) + citations = docenv.domaindata['citation'].get('citations', dict()) logger.info(" %s todos, %s index, %s citations"%( len(todos), len(docenv.indexentries), @@ -95,7 +95,7 @@ def merge_environment(app, env): for ind, (path, tag, lineno) in six.iteritems(citations): # TODO: Warn on conflicts newcite[ind] = (fixpath(path), tag, lineno) - env.domaindata["std"]["citations"].update(newcite) + env.domaindata['citation']['citations'].update(newcite) # merge the py:module indexes newmodules = {} for ind,(modpath,v1,v2,v3) in ( @@ -106,9 +106,9 @@ def merge_environment(app, env): logger.info('... done (%s todos, %s index, %s citations, %s modules)'%( len(env.todo_all_todos), len(env.indexentries), - len(env.domaindata["std"]["citations"]), + len(env.domaindata['citation']['citations']), len(env.domaindata['py']['modules']))) - write_citations(app, env.domaindata["std"]["citations"]) + write_citations(app, env.domaindata['citation']['citations']) def get_env(app, curdoc): From c16691f8d1cfef8ba9c38760066830d26c4ddc1f Mon Sep 17 00:00:00 2001 From: Antonio Rojas Date: Sun, 19 Apr 2020 12:14:48 +0200 Subject: [PATCH 07/23] docenv.domaindata['py']['modules'] has one more entry in sphinx 3 --- src/sage_setup/docbuild/ext/multidocs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sage_setup/docbuild/ext/multidocs.py b/src/sage_setup/docbuild/ext/multidocs.py index d5426c346a1..3a925ba3b24 100644 --- a/src/sage_setup/docbuild/ext/multidocs.py +++ b/src/sage_setup/docbuild/ext/multidocs.py @@ -98,9 +98,9 @@ def merge_environment(app, env): env.domaindata['citation']['citations'].update(newcite) # merge the py:module indexes newmodules = {} - for ind,(modpath,v1,v2,v3) in ( + for ind,(modpath,v1,v2,v3,v4) in ( six.iteritems(docenv.domaindata['py']['modules'])): - newmodules[ind] = (fixpath(modpath),v1,v2,v3) + newmodules[ind] = (fixpath(modpath),v1,v2,v3,v4) env.domaindata['py']['modules'].update(newmodules) logger.info(", %s modules"%(len(newmodules))) logger.info('... done (%s todos, %s index, %s citations, %s modules)'%( From 65c83f71d2f262eea047ed77b0d9290b8ad7ca70 Mon Sep 17 00:00:00 2001 From: Antonio Rojas Date: Sun, 19 Apr 2020 12:17:12 +0200 Subject: [PATCH 08/23] Port to index domain --- src/sage_setup/docbuild/ext/multidocs.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/sage_setup/docbuild/ext/multidocs.py b/src/sage_setup/docbuild/ext/multidocs.py index 3a925ba3b24..2d170a4ff76 100644 --- a/src/sage_setup/docbuild/ext/multidocs.py +++ b/src/sage_setup/docbuild/ext/multidocs.py @@ -58,9 +58,10 @@ def merge_environment(app, env): fixpath = lambda path: os.path.join(curdoc, path) todos = docenv.todo_all_todos if hasattr(docenv, "todo_all_todos") else [] citations = docenv.domaindata['citation'].get('citations', dict()) + indexentries = docenv.domaindata['index'].get('entries', dict()) logger.info(" %s todos, %s index, %s citations"%( len(todos), - len(docenv.indexentries), + len(indexentries), len(citations) ), nonl=1) @@ -73,12 +74,12 @@ def merge_environment(app, env): env.todo_all_todos += todos # merge the html index links newindex = {} - for ind in docenv.indexentries: + for ind in indexentries: if ind.startswith('sage/'): - newindex[fixpath(ind)] = docenv.indexentries[ind] + newindex[fixpath(ind)] = indexentries[ind] else: - newindex[ind] = docenv.indexentries[ind] - env.indexentries.update(newindex) + newindex[ind] = indexentries[ind] + env.domaindata['index']['entries'].update(newindex) # merge the all_docs links, needed by the js index newalldoc = {} for ind in docenv.all_docs: @@ -105,7 +106,7 @@ def merge_environment(app, env): logger.info(", %s modules"%(len(newmodules))) logger.info('... done (%s todos, %s index, %s citations, %s modules)'%( len(env.todo_all_todos), - len(env.indexentries), + len(env.domaindata['index']['entries']), len(env.domaindata['citation']['citations']), len(env.domaindata['py']['modules']))) write_citations(app, env.domaindata['citation']['citations']) From f4ba17d13d76698c97139290b001c685f51c436e Mon Sep 17 00:00:00 2001 From: Antonio Rojas Date: Sun, 19 Apr 2020 14:05:51 +0200 Subject: [PATCH 09/23] fix WARNING: duplicate object description --- src/sage/combinat/permutation.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/sage/combinat/permutation.py b/src/sage/combinat/permutation.py index a68d6734f81..ae644cf28a4 100644 --- a/src/sage/combinat/permutation.py +++ b/src/sage/combinat/permutation.py @@ -415,9 +415,6 @@ class Permutation(CombinatorialElement): [] sage: Permutation( [[], []] ) [] - - .. automethod:: Permutation.left_action_product - .. automethod:: Permutation.right_action_product """ @staticmethod def __classcall_private__(cls, l, check_input = True): From c7eb294d2d5c78e6c8ee3c48d205a12d42e9e8d7 Mon Sep 17 00:00:00 2001 From: Antonio Rojas Date: Sun, 19 Apr 2020 23:27:59 +0200 Subject: [PATCH 10/23] Port to todo domain --- src/sage_setup/docbuild/ext/multidocs.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/sage_setup/docbuild/ext/multidocs.py b/src/sage_setup/docbuild/ext/multidocs.py index 2d170a4ff76..722a2b6f524 100644 --- a/src/sage_setup/docbuild/ext/multidocs.py +++ b/src/sage_setup/docbuild/ext/multidocs.py @@ -47,20 +47,16 @@ def merge_environment(app, env): - domaindata['py']['modules'] # list of python modules """ logger.info(bold('Merging environment/index files...')) - if not hasattr(env, "todo_all_todos"): - env.todo_all_todos = [] - if not env.domaindata['citation'].get('citations'): - env.domaindata['citation']['citations'] = dict() for curdoc in app.env.config.multidocs_subdoc_list: logger.info(" %s:"%curdoc, nonl=1) docenv = get_env(app, curdoc) if docenv is not None: fixpath = lambda path: os.path.join(curdoc, path) - todos = docenv.todo_all_todos if hasattr(docenv, "todo_all_todos") else [] + todos = docenv.domaindata['todo'].get('todos', dict()) citations = docenv.domaindata['citation'].get('citations', dict()) indexentries = docenv.domaindata['index'].get('entries', dict()) logger.info(" %s todos, %s index, %s citations"%( - len(todos), + sum(len(t) for t in todos.values()), len(indexentries), len(citations) ), nonl=1) @@ -70,8 +66,7 @@ def merge_environment(app, env): env.titles[fixpath(t)] = docenv.titles[t] # merge the todo links for dct in todos: - dct['docname'] = fixpath(dct['docname']) - env.todo_all_todos += todos + env.domaindata['todo']['todos'][fixpath(dct)] = todos[dct] # merge the html index links newindex = {} for ind in indexentries: @@ -105,7 +100,7 @@ def merge_environment(app, env): env.domaindata['py']['modules'].update(newmodules) logger.info(", %s modules"%(len(newmodules))) logger.info('... done (%s todos, %s index, %s citations, %s modules)'%( - len(env.todo_all_todos), + sum(len(t) for t in env.domaindata['todo']['todos'].values()), len(env.domaindata['index']['entries']), len(env.domaindata['citation']['citations']), len(env.domaindata['py']['modules']))) From 568f1c760585b921ffbce95249c68a922171bac6 Mon Sep 17 00:00:00 2001 From: Antonio Rojas Date: Tue, 21 Apr 2020 12:14:19 +0200 Subject: [PATCH 11/23] Fix incomplete port to citation domain --- src/sage_setup/docbuild/ext/multidocs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sage_setup/docbuild/ext/multidocs.py b/src/sage_setup/docbuild/ext/multidocs.py index 722a2b6f524..ffed722d33a 100644 --- a/src/sage_setup/docbuild/ext/multidocs.py +++ b/src/sage_setup/docbuild/ext/multidocs.py @@ -254,7 +254,7 @@ def fetch_citation(app, env): with open(filename, 'rb') as f: cache = cPickle.load(f) logger.info("done (%s citations)."%len(cache)) - cite = env.domaindata["std"].get("citations", dict()) + cite = env.domaindata['citation'].get('citations', dict()) for ind, (path, tag, lineno) in six.iteritems(cache): if ind not in cite: # don't override local citation cite[ind] = (os.path.join("..", path), tag, lineno) From 3d1403ad8add2f07e8c05cde889756c3f92de997 Mon Sep 17 00:00:00 2001 From: Antonio Rojas Date: Tue, 21 Apr 2020 19:00:42 +0200 Subject: [PATCH 12/23] Remove non-python code from python code block --- src/doc/en/thematic_tutorials/structures_in_coding_theory.rst | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/doc/en/thematic_tutorials/structures_in_coding_theory.rst b/src/doc/en/thematic_tutorials/structures_in_coding_theory.rst index 13f1a83a2b6..4726bce061a 100644 --- a/src/doc/en/thematic_tutorials/structures_in_coding_theory.rst +++ b/src/doc/en/thematic_tutorials/structures_in_coding_theory.rst @@ -721,8 +721,6 @@ derive from the one that follows. .. CODE-BLOCK:: python - :class:`sage.coding.repetition_code.BinaryRepetitionCode ` - #the line above creates a link to the class in the html documentation of coding theory library from sage.coding.repetition_code import BinaryRepetitionCode ``encoders_catalog.py`` (continued): From ed74467dd6072f4fedb7a059506793b523485ad0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Bissey?= Date: Wed, 22 Apr 2020 11:13:06 +1200 Subject: [PATCH 13/23] update sphinx to 3.0.2 --- build/pkgs/sphinx/checksums.ini | 6 +++--- build/pkgs/sphinx/dependencies | 2 +- build/pkgs/sphinx/package-version.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/pkgs/sphinx/checksums.ini b/build/pkgs/sphinx/checksums.ini index b2eb3e430b5..0c592dd186c 100644 --- a/build/pkgs/sphinx/checksums.ini +++ b/build/pkgs/sphinx/checksums.ini @@ -1,4 +1,4 @@ tarball=Sphinx-VERSION.tar.gz -sha1=dd040aedbef765189c6a502c4031df023ae51f46 -md5=111982b6ca04130d4e512f59b2e4402f -cksum=4119668724 +sha1=fd8b7655c4a01b3580a2abc216ff24c6776298b0 +md5=20a2f1f67d88fac3743c11def966c9a6 +cksum=2308785561 diff --git a/build/pkgs/sphinx/dependencies b/build/pkgs/sphinx/dependencies index 5d943e8dd5f..16f478530e9 100644 --- a/build/pkgs/sphinx/dependencies +++ b/build/pkgs/sphinx/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) docutils jinja2 pygments six snowballstemmer imagesize babel alabaster requests typing sphinxcontrib_websupport packaging +$(PYTHON) | $(PYTHON_TOOLCHAIN) docutils jinja2 pygments six snowballstemmer imagesize babel alabaster requests typing sphinxcontrib_websupport sphinxcontrib_applehelp sphinxcontrib_devhelp sphinxcontrib_htmlhelp sphinxcontrib_jsmath sphinxcontrib_qthelp sphinxcontrib_serializinghtml packaging ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/sphinx/package-version.txt b/build/pkgs/sphinx/package-version.txt index a7590f238f1..16f01e82efb 100644 --- a/build/pkgs/sphinx/package-version.txt +++ b/build/pkgs/sphinx/package-version.txt @@ -1 +1 @@ -3.0.1.p0 +3.0.2.p0 From 8db286b6452db781ea4ff4b42f49a6c6896dffcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Bissey?= Date: Wed, 22 Apr 2020 11:13:59 +1200 Subject: [PATCH 14/23] update sphinx_contribwebsupport --- build/pkgs/sphinxcontrib_websupport/checksums.ini | 6 +++--- build/pkgs/sphinxcontrib_websupport/package-version.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/pkgs/sphinxcontrib_websupport/checksums.ini b/build/pkgs/sphinxcontrib_websupport/checksums.ini index 1f0d8d40396..f6ea886bcdd 100644 --- a/build/pkgs/sphinxcontrib_websupport/checksums.ini +++ b/build/pkgs/sphinxcontrib_websupport/checksums.ini @@ -1,4 +1,4 @@ tarball=sphinxcontrib-websupport-VERSION.tar.gz -sha1=03216c11167b75d2c1b08e34041ad2019c3e7dc9 -md5=ca6435e7b4eb9408df4f54972361e9d3 -cksum=1372914473 +sha1=313f4b764872d36f890e76579985e6aaa732f4ca +md5=4fe4d07afe1556c65182d0437228d7bb +cksum=1830011133 diff --git a/build/pkgs/sphinxcontrib_websupport/package-version.txt b/build/pkgs/sphinxcontrib_websupport/package-version.txt index 9084fa2f716..6085e946503 100644 --- a/build/pkgs/sphinxcontrib_websupport/package-version.txt +++ b/build/pkgs/sphinxcontrib_websupport/package-version.txt @@ -1 +1 @@ -1.1.0 +1.2.1 From d09e96539a5e18c6fb73a59e03bd24fa02ef6662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Bissey?= Date: Wed, 22 Apr 2020 11:15:54 +1200 Subject: [PATCH 15/23] Add new dependencies of sphinx --- build/pkgs/sphinxcontrib_applehelp/SPKG.txt | 9 +++++++++ build/pkgs/sphinxcontrib_applehelp/checksums.ini | 4 ++++ build/pkgs/sphinxcontrib_applehelp/dependencies | 5 +++++ build/pkgs/sphinxcontrib_applehelp/package-version.txt | 1 + build/pkgs/sphinxcontrib_applehelp/spkg-install.in | 1 + build/pkgs/sphinxcontrib_applehelp/type | 1 + build/pkgs/sphinxcontrib_devhelp/SPKG.txt | 9 +++++++++ build/pkgs/sphinxcontrib_devhelp/checksums.ini | 4 ++++ build/pkgs/sphinxcontrib_devhelp/dependencies | 5 +++++ build/pkgs/sphinxcontrib_devhelp/package-version.txt | 1 + build/pkgs/sphinxcontrib_devhelp/spkg-install.in | 1 + build/pkgs/sphinxcontrib_devhelp/type | 1 + build/pkgs/sphinxcontrib_htmlhelp/SPKG.txt | 9 +++++++++ build/pkgs/sphinxcontrib_htmlhelp/checksums.ini | 4 ++++ build/pkgs/sphinxcontrib_htmlhelp/dependencies | 5 +++++ build/pkgs/sphinxcontrib_htmlhelp/package-version.txt | 1 + build/pkgs/sphinxcontrib_htmlhelp/spkg-install.in | 1 + build/pkgs/sphinxcontrib_htmlhelp/type | 1 + build/pkgs/sphinxcontrib_jsmath/SPKG.txt | 9 +++++++++ build/pkgs/sphinxcontrib_jsmath/checksums.ini | 4 ++++ build/pkgs/sphinxcontrib_jsmath/dependencies | 5 +++++ build/pkgs/sphinxcontrib_jsmath/package-version.txt | 1 + build/pkgs/sphinxcontrib_jsmath/spkg-install.in | 1 + build/pkgs/sphinxcontrib_jsmath/type | 1 + build/pkgs/sphinxcontrib_qthelp/SPKG.txt | 9 +++++++++ build/pkgs/sphinxcontrib_qthelp/checksums.ini | 4 ++++ build/pkgs/sphinxcontrib_qthelp/dependencies | 5 +++++ build/pkgs/sphinxcontrib_qthelp/package-version.txt | 1 + build/pkgs/sphinxcontrib_qthelp/spkg-install.in | 1 + build/pkgs/sphinxcontrib_qthelp/type | 1 + build/pkgs/sphinxcontrib_serializinghtml/SPKG.txt | 9 +++++++++ build/pkgs/sphinxcontrib_serializinghtml/checksums.ini | 4 ++++ build/pkgs/sphinxcontrib_serializinghtml/dependencies | 5 +++++ .../sphinxcontrib_serializinghtml/package-version.txt | 1 + build/pkgs/sphinxcontrib_serializinghtml/spkg-install.in | 1 + build/pkgs/sphinxcontrib_serializinghtml/type | 1 + 36 files changed, 126 insertions(+) create mode 100644 build/pkgs/sphinxcontrib_applehelp/SPKG.txt create mode 100644 build/pkgs/sphinxcontrib_applehelp/checksums.ini create mode 100644 build/pkgs/sphinxcontrib_applehelp/dependencies create mode 100644 build/pkgs/sphinxcontrib_applehelp/package-version.txt create mode 100644 build/pkgs/sphinxcontrib_applehelp/spkg-install.in create mode 100644 build/pkgs/sphinxcontrib_applehelp/type create mode 100644 build/pkgs/sphinxcontrib_devhelp/SPKG.txt create mode 100644 build/pkgs/sphinxcontrib_devhelp/checksums.ini create mode 100644 build/pkgs/sphinxcontrib_devhelp/dependencies create mode 100644 build/pkgs/sphinxcontrib_devhelp/package-version.txt create mode 100644 build/pkgs/sphinxcontrib_devhelp/spkg-install.in create mode 100644 build/pkgs/sphinxcontrib_devhelp/type create mode 100644 build/pkgs/sphinxcontrib_htmlhelp/SPKG.txt create mode 100644 build/pkgs/sphinxcontrib_htmlhelp/checksums.ini create mode 100644 build/pkgs/sphinxcontrib_htmlhelp/dependencies create mode 100644 build/pkgs/sphinxcontrib_htmlhelp/package-version.txt create mode 100644 build/pkgs/sphinxcontrib_htmlhelp/spkg-install.in create mode 100644 build/pkgs/sphinxcontrib_htmlhelp/type create mode 100644 build/pkgs/sphinxcontrib_jsmath/SPKG.txt create mode 100644 build/pkgs/sphinxcontrib_jsmath/checksums.ini create mode 100644 build/pkgs/sphinxcontrib_jsmath/dependencies create mode 100644 build/pkgs/sphinxcontrib_jsmath/package-version.txt create mode 100644 build/pkgs/sphinxcontrib_jsmath/spkg-install.in create mode 100644 build/pkgs/sphinxcontrib_jsmath/type create mode 100644 build/pkgs/sphinxcontrib_qthelp/SPKG.txt create mode 100644 build/pkgs/sphinxcontrib_qthelp/checksums.ini create mode 100644 build/pkgs/sphinxcontrib_qthelp/dependencies create mode 100644 build/pkgs/sphinxcontrib_qthelp/package-version.txt create mode 100644 build/pkgs/sphinxcontrib_qthelp/spkg-install.in create mode 100644 build/pkgs/sphinxcontrib_qthelp/type create mode 100644 build/pkgs/sphinxcontrib_serializinghtml/SPKG.txt create mode 100644 build/pkgs/sphinxcontrib_serializinghtml/checksums.ini create mode 100644 build/pkgs/sphinxcontrib_serializinghtml/dependencies create mode 100644 build/pkgs/sphinxcontrib_serializinghtml/package-version.txt create mode 100644 build/pkgs/sphinxcontrib_serializinghtml/spkg-install.in create mode 100644 build/pkgs/sphinxcontrib_serializinghtml/type diff --git a/build/pkgs/sphinxcontrib_applehelp/SPKG.txt b/build/pkgs/sphinxcontrib_applehelp/SPKG.txt new file mode 100644 index 00000000000..ed59bda33d2 --- /dev/null +++ b/build/pkgs/sphinxcontrib_applehelp/SPKG.txt @@ -0,0 +1,9 @@ += sphinxcontrib-applehelp = + +== Description == + +Sphinx extension which outputs Apple help book + +== License == + +BSD diff --git a/build/pkgs/sphinxcontrib_applehelp/checksums.ini b/build/pkgs/sphinxcontrib_applehelp/checksums.ini new file mode 100644 index 00000000000..15e95c1e08c --- /dev/null +++ b/build/pkgs/sphinxcontrib_applehelp/checksums.ini @@ -0,0 +1,4 @@ +tarball=sphinxcontrib-applehelp-VERSION.tar.gz +sha1=adfd47917f82a86f30bdf356497baf68b47380bc +md5=3f2de7681e12dde031acee0497c3cc2b +cksum=1142149867 diff --git a/build/pkgs/sphinxcontrib_applehelp/dependencies b/build/pkgs/sphinxcontrib_applehelp/dependencies new file mode 100644 index 00000000000..d5dab729e18 --- /dev/null +++ b/build/pkgs/sphinxcontrib_applehelp/dependencies @@ -0,0 +1,5 @@ +$(PYTHON) | pip + +---------- +All lines of this file are ignored except the first. +It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile. diff --git a/build/pkgs/sphinxcontrib_applehelp/package-version.txt b/build/pkgs/sphinxcontrib_applehelp/package-version.txt new file mode 100644 index 00000000000..6d7de6e6abe --- /dev/null +++ b/build/pkgs/sphinxcontrib_applehelp/package-version.txt @@ -0,0 +1 @@ +1.0.2 diff --git a/build/pkgs/sphinxcontrib_applehelp/spkg-install.in b/build/pkgs/sphinxcontrib_applehelp/spkg-install.in new file mode 100644 index 00000000000..deba1bb42bb --- /dev/null +++ b/build/pkgs/sphinxcontrib_applehelp/spkg-install.in @@ -0,0 +1 @@ +cd src && sdh_pip_install . diff --git a/build/pkgs/sphinxcontrib_applehelp/type b/build/pkgs/sphinxcontrib_applehelp/type new file mode 100644 index 00000000000..a6a7b9cd726 --- /dev/null +++ b/build/pkgs/sphinxcontrib_applehelp/type @@ -0,0 +1 @@ +standard diff --git a/build/pkgs/sphinxcontrib_devhelp/SPKG.txt b/build/pkgs/sphinxcontrib_devhelp/SPKG.txt new file mode 100644 index 00000000000..50e27ba320e --- /dev/null +++ b/build/pkgs/sphinxcontrib_devhelp/SPKG.txt @@ -0,0 +1,9 @@ += sphinxcontrib-devhelp = + +== Description == + +Sphinx extension which outputs Devhelp documents + +== License == + +BSD diff --git a/build/pkgs/sphinxcontrib_devhelp/checksums.ini b/build/pkgs/sphinxcontrib_devhelp/checksums.ini new file mode 100644 index 00000000000..7da268d7933 --- /dev/null +++ b/build/pkgs/sphinxcontrib_devhelp/checksums.ini @@ -0,0 +1,4 @@ +tarball=sphinxcontrib-devhelp-VERSION.tar.gz +sha1=3782815be9e11190fe7c7d697e73369432c56fd6 +md5=94069c5cdb5079c445f5477fa6107016 +cksum=4072264365 diff --git a/build/pkgs/sphinxcontrib_devhelp/dependencies b/build/pkgs/sphinxcontrib_devhelp/dependencies new file mode 100644 index 00000000000..d5dab729e18 --- /dev/null +++ b/build/pkgs/sphinxcontrib_devhelp/dependencies @@ -0,0 +1,5 @@ +$(PYTHON) | pip + +---------- +All lines of this file are ignored except the first. +It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile. diff --git a/build/pkgs/sphinxcontrib_devhelp/package-version.txt b/build/pkgs/sphinxcontrib_devhelp/package-version.txt new file mode 100644 index 00000000000..6d7de6e6abe --- /dev/null +++ b/build/pkgs/sphinxcontrib_devhelp/package-version.txt @@ -0,0 +1 @@ +1.0.2 diff --git a/build/pkgs/sphinxcontrib_devhelp/spkg-install.in b/build/pkgs/sphinxcontrib_devhelp/spkg-install.in new file mode 100644 index 00000000000..deba1bb42bb --- /dev/null +++ b/build/pkgs/sphinxcontrib_devhelp/spkg-install.in @@ -0,0 +1 @@ +cd src && sdh_pip_install . diff --git a/build/pkgs/sphinxcontrib_devhelp/type b/build/pkgs/sphinxcontrib_devhelp/type new file mode 100644 index 00000000000..a6a7b9cd726 --- /dev/null +++ b/build/pkgs/sphinxcontrib_devhelp/type @@ -0,0 +1 @@ +standard diff --git a/build/pkgs/sphinxcontrib_htmlhelp/SPKG.txt b/build/pkgs/sphinxcontrib_htmlhelp/SPKG.txt new file mode 100644 index 00000000000..ef225d7bf13 --- /dev/null +++ b/build/pkgs/sphinxcontrib_htmlhelp/SPKG.txt @@ -0,0 +1,9 @@ += sphinxcontrib-htmlhelp = + +== Description == + +Sphinx extension which outputs HTML help book + +== License == + +BSD diff --git a/build/pkgs/sphinxcontrib_htmlhelp/checksums.ini b/build/pkgs/sphinxcontrib_htmlhelp/checksums.ini new file mode 100644 index 00000000000..5660ef2eef8 --- /dev/null +++ b/build/pkgs/sphinxcontrib_htmlhelp/checksums.ini @@ -0,0 +1,4 @@ +tarball=sphinxcontrib-htmlhelp-VERSION.tar.gz +sha1=fc695250bc781777203b3a97a7aa7b0eab8a2c51 +md5=f1db7db2a467f08f6292ab0d76e38584 +cksum=1195324208 diff --git a/build/pkgs/sphinxcontrib_htmlhelp/dependencies b/build/pkgs/sphinxcontrib_htmlhelp/dependencies new file mode 100644 index 00000000000..d5dab729e18 --- /dev/null +++ b/build/pkgs/sphinxcontrib_htmlhelp/dependencies @@ -0,0 +1,5 @@ +$(PYTHON) | pip + +---------- +All lines of this file are ignored except the first. +It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile. diff --git a/build/pkgs/sphinxcontrib_htmlhelp/package-version.txt b/build/pkgs/sphinxcontrib_htmlhelp/package-version.txt new file mode 100644 index 00000000000..21e8796a09d --- /dev/null +++ b/build/pkgs/sphinxcontrib_htmlhelp/package-version.txt @@ -0,0 +1 @@ +1.0.3 diff --git a/build/pkgs/sphinxcontrib_htmlhelp/spkg-install.in b/build/pkgs/sphinxcontrib_htmlhelp/spkg-install.in new file mode 100644 index 00000000000..deba1bb42bb --- /dev/null +++ b/build/pkgs/sphinxcontrib_htmlhelp/spkg-install.in @@ -0,0 +1 @@ +cd src && sdh_pip_install . diff --git a/build/pkgs/sphinxcontrib_htmlhelp/type b/build/pkgs/sphinxcontrib_htmlhelp/type new file mode 100644 index 00000000000..a6a7b9cd726 --- /dev/null +++ b/build/pkgs/sphinxcontrib_htmlhelp/type @@ -0,0 +1 @@ +standard diff --git a/build/pkgs/sphinxcontrib_jsmath/SPKG.txt b/build/pkgs/sphinxcontrib_jsmath/SPKG.txt new file mode 100644 index 00000000000..243e8ad9955 --- /dev/null +++ b/build/pkgs/sphinxcontrib_jsmath/SPKG.txt @@ -0,0 +1,9 @@ += sphinxcontrib-jsmath = + +== Description == + +Sphinx extension which renders display math in HTML via JavaScript + +== License == + +BSD diff --git a/build/pkgs/sphinxcontrib_jsmath/checksums.ini b/build/pkgs/sphinxcontrib_jsmath/checksums.ini new file mode 100644 index 00000000000..de57cfa567e --- /dev/null +++ b/build/pkgs/sphinxcontrib_jsmath/checksums.ini @@ -0,0 +1,4 @@ +tarball=sphinxcontrib-jsmath-VERSION.tar.gz +sha1=70348505f159dca801522d6df68230e3c5e749c7 +md5=e45179f0a3608b6766862e0f34c23b62 +cksum=3778623264 diff --git a/build/pkgs/sphinxcontrib_jsmath/dependencies b/build/pkgs/sphinxcontrib_jsmath/dependencies new file mode 100644 index 00000000000..d5dab729e18 --- /dev/null +++ b/build/pkgs/sphinxcontrib_jsmath/dependencies @@ -0,0 +1,5 @@ +$(PYTHON) | pip + +---------- +All lines of this file are ignored except the first. +It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile. diff --git a/build/pkgs/sphinxcontrib_jsmath/package-version.txt b/build/pkgs/sphinxcontrib_jsmath/package-version.txt new file mode 100644 index 00000000000..7dea76edb3d --- /dev/null +++ b/build/pkgs/sphinxcontrib_jsmath/package-version.txt @@ -0,0 +1 @@ +1.0.1 diff --git a/build/pkgs/sphinxcontrib_jsmath/spkg-install.in b/build/pkgs/sphinxcontrib_jsmath/spkg-install.in new file mode 100644 index 00000000000..deba1bb42bb --- /dev/null +++ b/build/pkgs/sphinxcontrib_jsmath/spkg-install.in @@ -0,0 +1 @@ +cd src && sdh_pip_install . diff --git a/build/pkgs/sphinxcontrib_jsmath/type b/build/pkgs/sphinxcontrib_jsmath/type new file mode 100644 index 00000000000..a6a7b9cd726 --- /dev/null +++ b/build/pkgs/sphinxcontrib_jsmath/type @@ -0,0 +1 @@ +standard diff --git a/build/pkgs/sphinxcontrib_qthelp/SPKG.txt b/build/pkgs/sphinxcontrib_qthelp/SPKG.txt new file mode 100644 index 00000000000..8c27c1c3003 --- /dev/null +++ b/build/pkgs/sphinxcontrib_qthelp/SPKG.txt @@ -0,0 +1,9 @@ += sphinxcontrib-qthelp = + +== Description == + +Sphinx extension which outputs QtHelp documents + +== License == + +BSD diff --git a/build/pkgs/sphinxcontrib_qthelp/checksums.ini b/build/pkgs/sphinxcontrib_qthelp/checksums.ini new file mode 100644 index 00000000000..098fa44f7af --- /dev/null +++ b/build/pkgs/sphinxcontrib_qthelp/checksums.ini @@ -0,0 +1,4 @@ +tarball=sphinxcontrib-qthelp-VERSION.tar.gz +sha1=3f0d3b111e2a57ae24afc51c518ebc2e9e377cd5 +md5=93216721f3e154cce12d1e9c3307b415 +cksum=3260884791 diff --git a/build/pkgs/sphinxcontrib_qthelp/dependencies b/build/pkgs/sphinxcontrib_qthelp/dependencies new file mode 100644 index 00000000000..d5dab729e18 --- /dev/null +++ b/build/pkgs/sphinxcontrib_qthelp/dependencies @@ -0,0 +1,5 @@ +$(PYTHON) | pip + +---------- +All lines of this file are ignored except the first. +It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile. diff --git a/build/pkgs/sphinxcontrib_qthelp/package-version.txt b/build/pkgs/sphinxcontrib_qthelp/package-version.txt new file mode 100644 index 00000000000..21e8796a09d --- /dev/null +++ b/build/pkgs/sphinxcontrib_qthelp/package-version.txt @@ -0,0 +1 @@ +1.0.3 diff --git a/build/pkgs/sphinxcontrib_qthelp/spkg-install.in b/build/pkgs/sphinxcontrib_qthelp/spkg-install.in new file mode 100644 index 00000000000..deba1bb42bb --- /dev/null +++ b/build/pkgs/sphinxcontrib_qthelp/spkg-install.in @@ -0,0 +1 @@ +cd src && sdh_pip_install . diff --git a/build/pkgs/sphinxcontrib_qthelp/type b/build/pkgs/sphinxcontrib_qthelp/type new file mode 100644 index 00000000000..a6a7b9cd726 --- /dev/null +++ b/build/pkgs/sphinxcontrib_qthelp/type @@ -0,0 +1 @@ +standard diff --git a/build/pkgs/sphinxcontrib_serializinghtml/SPKG.txt b/build/pkgs/sphinxcontrib_serializinghtml/SPKG.txt new file mode 100644 index 00000000000..bb3c470abf7 --- /dev/null +++ b/build/pkgs/sphinxcontrib_serializinghtml/SPKG.txt @@ -0,0 +1,9 @@ += sphinxcontrib-serializinghtml = + +== Description == + +Sphinx extension which outputs serialized HTML files + +== License == + +BSD diff --git a/build/pkgs/sphinxcontrib_serializinghtml/checksums.ini b/build/pkgs/sphinxcontrib_serializinghtml/checksums.ini new file mode 100644 index 00000000000..90c9bc408cf --- /dev/null +++ b/build/pkgs/sphinxcontrib_serializinghtml/checksums.ini @@ -0,0 +1,4 @@ +tarball=sphinxcontrib-serializinghtml-VERSION.tar.gz +sha1=7d782d9f8fef0a5663fc7732d72847e711f0f18b +md5=518ff437dcb05a74ed32ba19c892ce05 +cksum=3002072803 diff --git a/build/pkgs/sphinxcontrib_serializinghtml/dependencies b/build/pkgs/sphinxcontrib_serializinghtml/dependencies new file mode 100644 index 00000000000..d5dab729e18 --- /dev/null +++ b/build/pkgs/sphinxcontrib_serializinghtml/dependencies @@ -0,0 +1,5 @@ +$(PYTHON) | pip + +---------- +All lines of this file are ignored except the first. +It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile. diff --git a/build/pkgs/sphinxcontrib_serializinghtml/package-version.txt b/build/pkgs/sphinxcontrib_serializinghtml/package-version.txt new file mode 100644 index 00000000000..65087b4f5ec --- /dev/null +++ b/build/pkgs/sphinxcontrib_serializinghtml/package-version.txt @@ -0,0 +1 @@ +1.1.4 diff --git a/build/pkgs/sphinxcontrib_serializinghtml/spkg-install.in b/build/pkgs/sphinxcontrib_serializinghtml/spkg-install.in new file mode 100644 index 00000000000..deba1bb42bb --- /dev/null +++ b/build/pkgs/sphinxcontrib_serializinghtml/spkg-install.in @@ -0,0 +1 @@ +cd src && sdh_pip_install . diff --git a/build/pkgs/sphinxcontrib_serializinghtml/type b/build/pkgs/sphinxcontrib_serializinghtml/type new file mode 100644 index 00000000000..a6a7b9cd726 --- /dev/null +++ b/build/pkgs/sphinxcontrib_serializinghtml/type @@ -0,0 +1 @@ +standard From 2061379f25e9ddf6f7e00bf3d1672abda6d26b29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Bissey?= Date: Thu, 23 Apr 2020 15:35:58 +1200 Subject: [PATCH 16/23] add upstream_url to all sphinx packages. --- build/pkgs/sphinx/checksums.ini | 1 + build/pkgs/sphinxcontrib_applehelp/checksums.ini | 1 + build/pkgs/sphinxcontrib_devhelp/checksums.ini | 1 + build/pkgs/sphinxcontrib_htmlhelp/checksums.ini | 1 + build/pkgs/sphinxcontrib_jsmath/checksums.ini | 1 + build/pkgs/sphinxcontrib_qthelp/checksums.ini | 1 + build/pkgs/sphinxcontrib_serializinghtml/checksums.ini | 1 + build/pkgs/sphinxcontrib_websupport/checksums.ini | 1 + 8 files changed, 8 insertions(+) diff --git a/build/pkgs/sphinx/checksums.ini b/build/pkgs/sphinx/checksums.ini index 0c592dd186c..8f8c919290f 100644 --- a/build/pkgs/sphinx/checksums.ini +++ b/build/pkgs/sphinx/checksums.ini @@ -2,3 +2,4 @@ tarball=Sphinx-VERSION.tar.gz sha1=fd8b7655c4a01b3580a2abc216ff24c6776298b0 md5=20a2f1f67d88fac3743c11def966c9a6 cksum=2308785561 +upstream_url=https://files.pythonhosted.org/packages/a4/4a/0d48d133675eafb602714b3472b214e63d438e7e6985d41977e617b81f7a/Sphinx-VERSION.tar.gz diff --git a/build/pkgs/sphinxcontrib_applehelp/checksums.ini b/build/pkgs/sphinxcontrib_applehelp/checksums.ini index 15e95c1e08c..0bf12a630cc 100644 --- a/build/pkgs/sphinxcontrib_applehelp/checksums.ini +++ b/build/pkgs/sphinxcontrib_applehelp/checksums.ini @@ -2,3 +2,4 @@ tarball=sphinxcontrib-applehelp-VERSION.tar.gz sha1=adfd47917f82a86f30bdf356497baf68b47380bc md5=3f2de7681e12dde031acee0497c3cc2b cksum=1142149867 +upstream_url=https://files.pythonhosted.org/packages/9f/01/ad9d4ebbceddbed9979ab4a89ddb78c9760e74e6757b1880f1b2760e8295/sphinxcontrib-applehelp-VERSION.tar.gz diff --git a/build/pkgs/sphinxcontrib_devhelp/checksums.ini b/build/pkgs/sphinxcontrib_devhelp/checksums.ini index 7da268d7933..d751730c830 100644 --- a/build/pkgs/sphinxcontrib_devhelp/checksums.ini +++ b/build/pkgs/sphinxcontrib_devhelp/checksums.ini @@ -2,3 +2,4 @@ tarball=sphinxcontrib-devhelp-VERSION.tar.gz sha1=3782815be9e11190fe7c7d697e73369432c56fd6 md5=94069c5cdb5079c445f5477fa6107016 cksum=4072264365 +upstream_url=https://files.pythonhosted.org/packages/98/33/dc28393f16385f722c893cb55539c641c9aaec8d1bc1c15b69ce0ac2dbb3/sphinxcontrib-devhelp-VERSION.tar.gz diff --git a/build/pkgs/sphinxcontrib_htmlhelp/checksums.ini b/build/pkgs/sphinxcontrib_htmlhelp/checksums.ini index 5660ef2eef8..3bf844abaec 100644 --- a/build/pkgs/sphinxcontrib_htmlhelp/checksums.ini +++ b/build/pkgs/sphinxcontrib_htmlhelp/checksums.ini @@ -2,3 +2,4 @@ tarball=sphinxcontrib-htmlhelp-VERSION.tar.gz sha1=fc695250bc781777203b3a97a7aa7b0eab8a2c51 md5=f1db7db2a467f08f6292ab0d76e38584 cksum=1195324208 +upstream_url=https://files.pythonhosted.org/packages/c9/2e/a7a5fef38327b7f643ed13646321d19903a2f54b0a05868e4bc34d729e1f/sphinxcontrib-htmlhelp-VERSION.tar.gz diff --git a/build/pkgs/sphinxcontrib_jsmath/checksums.ini b/build/pkgs/sphinxcontrib_jsmath/checksums.ini index de57cfa567e..c22ac5d1981 100644 --- a/build/pkgs/sphinxcontrib_jsmath/checksums.ini +++ b/build/pkgs/sphinxcontrib_jsmath/checksums.ini @@ -2,3 +2,4 @@ tarball=sphinxcontrib-jsmath-VERSION.tar.gz sha1=70348505f159dca801522d6df68230e3c5e749c7 md5=e45179f0a3608b6766862e0f34c23b62 cksum=3778623264 +upstream_url=https://files.pythonhosted.org/packages/b2/e8/9ed3830aeed71f17c026a07a5097edcf44b692850ef215b161b8ad875729/sphinxcontrib-jsmath-VERSION.tar.gz diff --git a/build/pkgs/sphinxcontrib_qthelp/checksums.ini b/build/pkgs/sphinxcontrib_qthelp/checksums.ini index 098fa44f7af..09912de47da 100644 --- a/build/pkgs/sphinxcontrib_qthelp/checksums.ini +++ b/build/pkgs/sphinxcontrib_qthelp/checksums.ini @@ -2,3 +2,4 @@ tarball=sphinxcontrib-qthelp-VERSION.tar.gz sha1=3f0d3b111e2a57ae24afc51c518ebc2e9e377cd5 md5=93216721f3e154cce12d1e9c3307b415 cksum=3260884791 +upstream_url=https://files.pythonhosted.org/packages/b1/8e/c4846e59f38a5f2b4a0e3b27af38f2fcf904d4bfd82095bf92de0b114ebd/sphinxcontrib-qthelp-VERSION.tar.gz diff --git a/build/pkgs/sphinxcontrib_serializinghtml/checksums.ini b/build/pkgs/sphinxcontrib_serializinghtml/checksums.ini index 90c9bc408cf..c2e3c37481b 100644 --- a/build/pkgs/sphinxcontrib_serializinghtml/checksums.ini +++ b/build/pkgs/sphinxcontrib_serializinghtml/checksums.ini @@ -2,3 +2,4 @@ tarball=sphinxcontrib-serializinghtml-VERSION.tar.gz sha1=7d782d9f8fef0a5663fc7732d72847e711f0f18b md5=518ff437dcb05a74ed32ba19c892ce05 cksum=3002072803 +upstream_url=https://files.pythonhosted.org/packages/ac/86/021876a9dd4eac9dae0b1d454d848acbd56d5574d350d0f835043b5ac2cd/sphinxcontrib-serializinghtml-VERSION.tar.gz diff --git a/build/pkgs/sphinxcontrib_websupport/checksums.ini b/build/pkgs/sphinxcontrib_websupport/checksums.ini index f6ea886bcdd..3938e3c7112 100644 --- a/build/pkgs/sphinxcontrib_websupport/checksums.ini +++ b/build/pkgs/sphinxcontrib_websupport/checksums.ini @@ -2,3 +2,4 @@ tarball=sphinxcontrib-websupport-VERSION.tar.gz sha1=313f4b764872d36f890e76579985e6aaa732f4ca md5=4fe4d07afe1556c65182d0437228d7bb cksum=1830011133 +upstream_url=https://files.pythonhosted.org/packages/60/65/78e1514be951a3584df2e27b1b86e22609dd73312461e1af2afb9a53152c/sphinxcontrib-websupport-VERSION.tar.gz From 2b03045e7f1a881fcfec5d14714dbacad6000665 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Bissey?= Date: Thu, 23 Apr 2020 22:27:02 +1200 Subject: [PATCH 17/23] Fix the last two doctests --- src/sage/misc/sagedoc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sage/misc/sagedoc.py b/src/sage/misc/sagedoc.py index 85ee7644fac..795dfd37fcb 100644 --- a/src/sage/misc/sagedoc.py +++ b/src/sage/misc/sagedoc.py @@ -24,7 +24,7 @@ ....: for line in fobj: ....: if "#sage.symbolic.expression.Expression.numerical_approx" in line: ....: print(line) - numerical_approx(prec=None, digits=None, algorithm=None)... + numerical_approx(prec=None, digits=None, algorithm=None)... Check that sphinx is not imported at Sage start-up:: From 8387b7b0546df138e8318ec679a53dfd5b8dc31c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Bissey?= Date: Fri, 24 Apr 2020 08:00:45 +1200 Subject: [PATCH 18/23] add forgotten doctest fix. --- src/sage/docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sage/docs/conf.py b/src/sage/docs/conf.py index a420990abba..c4941f0c669 100644 --- a/src/sage/docs/conf.py +++ b/src/sage/docs/conf.py @@ -670,7 +670,7 @@ def call_intersphinx(app, env, node, contnode): sage: for line in open(thematic_index).readlines(): # optional - dochtml ....: if "padics" in line: ....: _ = sys.stdout.write(line) -
  • Introduction to the p-adics
    • +

  • Introduction to the p-adics

    • """ debug_inf(app, "???? Trying intersphinx for %s" % node['reftarget']) builder = app.builder From 2ddcd319979ed4746aba8fc02b3757f623015a70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Bissey?= Date: Fri, 24 Apr 2020 09:24:12 +1200 Subject: [PATCH 19/23] change upstream_url to a (hopefully) more stable and easy to decipher address for sphinx packages --- build/pkgs/sphinx/checksums.ini | 2 +- build/pkgs/sphinxcontrib_applehelp/checksums.ini | 2 +- build/pkgs/sphinxcontrib_devhelp/checksums.ini | 2 +- build/pkgs/sphinxcontrib_htmlhelp/checksums.ini | 2 +- build/pkgs/sphinxcontrib_jsmath/checksums.ini | 2 +- build/pkgs/sphinxcontrib_qthelp/checksums.ini | 2 +- build/pkgs/sphinxcontrib_serializinghtml/checksums.ini | 2 +- build/pkgs/sphinxcontrib_websupport/checksums.ini | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/pkgs/sphinx/checksums.ini b/build/pkgs/sphinx/checksums.ini index 8f8c919290f..37da471e1c9 100644 --- a/build/pkgs/sphinx/checksums.ini +++ b/build/pkgs/sphinx/checksums.ini @@ -2,4 +2,4 @@ tarball=Sphinx-VERSION.tar.gz sha1=fd8b7655c4a01b3580a2abc216ff24c6776298b0 md5=20a2f1f67d88fac3743c11def966c9a6 cksum=2308785561 -upstream_url=https://files.pythonhosted.org/packages/a4/4a/0d48d133675eafb602714b3472b214e63d438e7e6985d41977e617b81f7a/Sphinx-VERSION.tar.gz +upstream_url=https://pypi.io/packages/source/s/sphinx/Sphinx-VERSION.tar.gz diff --git a/build/pkgs/sphinxcontrib_applehelp/checksums.ini b/build/pkgs/sphinxcontrib_applehelp/checksums.ini index 0bf12a630cc..ed55d035f14 100644 --- a/build/pkgs/sphinxcontrib_applehelp/checksums.ini +++ b/build/pkgs/sphinxcontrib_applehelp/checksums.ini @@ -2,4 +2,4 @@ tarball=sphinxcontrib-applehelp-VERSION.tar.gz sha1=adfd47917f82a86f30bdf356497baf68b47380bc md5=3f2de7681e12dde031acee0497c3cc2b cksum=1142149867 -upstream_url=https://files.pythonhosted.org/packages/9f/01/ad9d4ebbceddbed9979ab4a89ddb78c9760e74e6757b1880f1b2760e8295/sphinxcontrib-applehelp-VERSION.tar.gz +upstream_url=https://pypi.io/packages/source/s/sphinxcontrib-applehelp/sphinxcontrib-applehelp-VERSION.tar.gz diff --git a/build/pkgs/sphinxcontrib_devhelp/checksums.ini b/build/pkgs/sphinxcontrib_devhelp/checksums.ini index d751730c830..ec2f9b15bbe 100644 --- a/build/pkgs/sphinxcontrib_devhelp/checksums.ini +++ b/build/pkgs/sphinxcontrib_devhelp/checksums.ini @@ -2,4 +2,4 @@ tarball=sphinxcontrib-devhelp-VERSION.tar.gz sha1=3782815be9e11190fe7c7d697e73369432c56fd6 md5=94069c5cdb5079c445f5477fa6107016 cksum=4072264365 -upstream_url=https://files.pythonhosted.org/packages/98/33/dc28393f16385f722c893cb55539c641c9aaec8d1bc1c15b69ce0ac2dbb3/sphinxcontrib-devhelp-VERSION.tar.gz +upstream_url=https://pypi.io/packages/source/s/sphinxcontrib-devhelp/sphinxcontrib-devhelp-VERSION.tar.gz diff --git a/build/pkgs/sphinxcontrib_htmlhelp/checksums.ini b/build/pkgs/sphinxcontrib_htmlhelp/checksums.ini index 3bf844abaec..818e991207c 100644 --- a/build/pkgs/sphinxcontrib_htmlhelp/checksums.ini +++ b/build/pkgs/sphinxcontrib_htmlhelp/checksums.ini @@ -2,4 +2,4 @@ tarball=sphinxcontrib-htmlhelp-VERSION.tar.gz sha1=fc695250bc781777203b3a97a7aa7b0eab8a2c51 md5=f1db7db2a467f08f6292ab0d76e38584 cksum=1195324208 -upstream_url=https://files.pythonhosted.org/packages/c9/2e/a7a5fef38327b7f643ed13646321d19903a2f54b0a05868e4bc34d729e1f/sphinxcontrib-htmlhelp-VERSION.tar.gz +upstream_url=https://pypi.io/packages/source/s/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-VERSION.tar.gz diff --git a/build/pkgs/sphinxcontrib_jsmath/checksums.ini b/build/pkgs/sphinxcontrib_jsmath/checksums.ini index c22ac5d1981..f2fdba79204 100644 --- a/build/pkgs/sphinxcontrib_jsmath/checksums.ini +++ b/build/pkgs/sphinxcontrib_jsmath/checksums.ini @@ -2,4 +2,4 @@ tarball=sphinxcontrib-jsmath-VERSION.tar.gz sha1=70348505f159dca801522d6df68230e3c5e749c7 md5=e45179f0a3608b6766862e0f34c23b62 cksum=3778623264 -upstream_url=https://files.pythonhosted.org/packages/b2/e8/9ed3830aeed71f17c026a07a5097edcf44b692850ef215b161b8ad875729/sphinxcontrib-jsmath-VERSION.tar.gz +upstream_url=https://pypi.io/packages/source/s/sphinxcontrib-jsmath/sphinxcontrib-jsmath-VERSION.tar.gz diff --git a/build/pkgs/sphinxcontrib_qthelp/checksums.ini b/build/pkgs/sphinxcontrib_qthelp/checksums.ini index 09912de47da..e1ff365400e 100644 --- a/build/pkgs/sphinxcontrib_qthelp/checksums.ini +++ b/build/pkgs/sphinxcontrib_qthelp/checksums.ini @@ -2,4 +2,4 @@ tarball=sphinxcontrib-qthelp-VERSION.tar.gz sha1=3f0d3b111e2a57ae24afc51c518ebc2e9e377cd5 md5=93216721f3e154cce12d1e9c3307b415 cksum=3260884791 -upstream_url=https://files.pythonhosted.org/packages/b1/8e/c4846e59f38a5f2b4a0e3b27af38f2fcf904d4bfd82095bf92de0b114ebd/sphinxcontrib-qthelp-VERSION.tar.gz +upstream_url=https://pypi.io/packages/source/s/sphinxcontrib-qthelp/sphinxcontrib-qthelp-VERSION.tar.gz diff --git a/build/pkgs/sphinxcontrib_serializinghtml/checksums.ini b/build/pkgs/sphinxcontrib_serializinghtml/checksums.ini index c2e3c37481b..ea8ac106822 100644 --- a/build/pkgs/sphinxcontrib_serializinghtml/checksums.ini +++ b/build/pkgs/sphinxcontrib_serializinghtml/checksums.ini @@ -2,4 +2,4 @@ tarball=sphinxcontrib-serializinghtml-VERSION.tar.gz sha1=7d782d9f8fef0a5663fc7732d72847e711f0f18b md5=518ff437dcb05a74ed32ba19c892ce05 cksum=3002072803 -upstream_url=https://files.pythonhosted.org/packages/ac/86/021876a9dd4eac9dae0b1d454d848acbd56d5574d350d0f835043b5ac2cd/sphinxcontrib-serializinghtml-VERSION.tar.gz +upstream_url=https://pypi.io/packages/source/s/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-VERSION.tar.gz diff --git a/build/pkgs/sphinxcontrib_websupport/checksums.ini b/build/pkgs/sphinxcontrib_websupport/checksums.ini index 3938e3c7112..5fd49b7e2ac 100644 --- a/build/pkgs/sphinxcontrib_websupport/checksums.ini +++ b/build/pkgs/sphinxcontrib_websupport/checksums.ini @@ -2,4 +2,4 @@ tarball=sphinxcontrib-websupport-VERSION.tar.gz sha1=313f4b764872d36f890e76579985e6aaa732f4ca md5=4fe4d07afe1556c65182d0437228d7bb cksum=1830011133 -upstream_url=https://files.pythonhosted.org/packages/60/65/78e1514be951a3584df2e27b1b86e22609dd73312461e1af2afb9a53152c/sphinxcontrib-websupport-VERSION.tar.gz +upstream_url=https://pypi.io/packages/source/s/sphinxcontrib-websupport/sphinxcontrib-websupport-VERSION.tar.gz From 649289e2f92f7327e0d634540232b9985fc51258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Bissey?= Date: Fri, 24 Apr 2020 09:39:09 +1200 Subject: [PATCH 20/23] move sphinx packages from pip to PYTHON_TOOLCHAIN --- build/pkgs/sphinxcontrib_applehelp/dependencies | 2 +- build/pkgs/sphinxcontrib_devhelp/dependencies | 2 +- build/pkgs/sphinxcontrib_htmlhelp/dependencies | 2 +- build/pkgs/sphinxcontrib_jsmath/dependencies | 2 +- build/pkgs/sphinxcontrib_qthelp/dependencies | 2 +- build/pkgs/sphinxcontrib_serializinghtml/dependencies | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/pkgs/sphinxcontrib_applehelp/dependencies b/build/pkgs/sphinxcontrib_applehelp/dependencies index d5dab729e18..15df0c4d6d8 100644 --- a/build/pkgs/sphinxcontrib_applehelp/dependencies +++ b/build/pkgs/sphinxcontrib_applehelp/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | pip +$(PYTHON) | $(PYTHON_TOOLCHAIN) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/sphinxcontrib_devhelp/dependencies b/build/pkgs/sphinxcontrib_devhelp/dependencies index d5dab729e18..15df0c4d6d8 100644 --- a/build/pkgs/sphinxcontrib_devhelp/dependencies +++ b/build/pkgs/sphinxcontrib_devhelp/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | pip +$(PYTHON) | $(PYTHON_TOOLCHAIN) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/sphinxcontrib_htmlhelp/dependencies b/build/pkgs/sphinxcontrib_htmlhelp/dependencies index d5dab729e18..15df0c4d6d8 100644 --- a/build/pkgs/sphinxcontrib_htmlhelp/dependencies +++ b/build/pkgs/sphinxcontrib_htmlhelp/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | pip +$(PYTHON) | $(PYTHON_TOOLCHAIN) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/sphinxcontrib_jsmath/dependencies b/build/pkgs/sphinxcontrib_jsmath/dependencies index d5dab729e18..15df0c4d6d8 100644 --- a/build/pkgs/sphinxcontrib_jsmath/dependencies +++ b/build/pkgs/sphinxcontrib_jsmath/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | pip +$(PYTHON) | $(PYTHON_TOOLCHAIN) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/sphinxcontrib_qthelp/dependencies b/build/pkgs/sphinxcontrib_qthelp/dependencies index d5dab729e18..15df0c4d6d8 100644 --- a/build/pkgs/sphinxcontrib_qthelp/dependencies +++ b/build/pkgs/sphinxcontrib_qthelp/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | pip +$(PYTHON) | $(PYTHON_TOOLCHAIN) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/sphinxcontrib_serializinghtml/dependencies b/build/pkgs/sphinxcontrib_serializinghtml/dependencies index d5dab729e18..15df0c4d6d8 100644 --- a/build/pkgs/sphinxcontrib_serializinghtml/dependencies +++ b/build/pkgs/sphinxcontrib_serializinghtml/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | pip +$(PYTHON) | $(PYTHON_TOOLCHAIN) ---------- All lines of this file are ignored except the first. From e5415da0fbdb0f40411b977d947760cf88767ea5 Mon Sep 17 00:00:00 2001 From: "John H. Palmieri" Date: Fri, 24 Apr 2020 16:04:44 -0700 Subject: [PATCH 21/23] trac 28856: fix apostrophes in wikipedia links --- src/sage/categories/semigroups.py | 8 ++++---- src/sage/combinat/partition.py | 2 +- src/sage/combinat/posets/posets.py | 4 ++-- src/sage/combinat/root_system/plot.py | 2 +- src/sage/functions/jacobi.py | 2 +- .../geometry/riemannian_manifolds/surface3d_generators.py | 2 +- src/sage/graphs/base/static_sparse_graph.pyx | 2 +- src/sage/graphs/bipartite_graph.py | 2 +- src/sage/graphs/generators/smallgraphs.py | 2 +- src/sage/graphs/path_enumeration.pyx | 2 +- src/sage/graphs/spanning_tree.pyx | 4 ++-- src/sage/groups/matrix_gps/finitely_generated.py | 2 +- src/sage/matroids/linear_matroid.pyx | 2 +- src/sage/modules/free_module_element.pyx | 5 ++--- src/sage/plot/plot3d/parametric_plot3d.py | 2 +- 15 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/sage/categories/semigroups.py b/src/sage/categories/semigroups.py index 3f9939aeb2a..a24d8c8a4b5 100644 --- a/src/sage/categories/semigroups.py +++ b/src/sage/categories/semigroups.py @@ -543,7 +543,7 @@ def LTrivial(self): .. SEEALSO:: - - :wikipedia:`Green's_relations` + - :wikipedia:`Green%27s_relations` - :class:`Semigroups.SubcategoryMethods.RTrivial` - :class:`Semigroups.SubcategoryMethods.JTrivial` - :class:`Semigroups.SubcategoryMethods.HTrivial` @@ -588,7 +588,7 @@ def RTrivial(self): .. SEEALSO:: - - :wikipedia:`Green's_relations` + - :wikipedia:`Green%27s_relations` - :class:`Semigroups.SubcategoryMethods.LTrivial` - :class:`Semigroups.SubcategoryMethods.JTrivial` - :class:`Semigroups.SubcategoryMethods.HTrivial` @@ -644,7 +644,7 @@ def JTrivial(self): .. SEEALSO:: - - :wikipedia:`Green's_relations` + - :wikipedia:`Green%27s_relations` - :class:`Semigroups.SubcategoryMethods.LTrivial` - :class:`Semigroups.SubcategoryMethods.RTrivial` - :class:`Semigroups.SubcategoryMethods.HTrivial` @@ -680,7 +680,7 @@ def HTrivial(self): .. SEEALSO:: - - :wikipedia:`Green's_relations` + - :wikipedia:`Green%27s_relations` - :class:`Semigroups.SubcategoryMethods.RTrivial` - :class:`Semigroups.SubcategoryMethods.LTrivial` - :class:`Semigroups.SubcategoryMethods.JTrivial` diff --git a/src/sage/combinat/partition.py b/src/sage/combinat/partition.py index e046474e857..d51f04c0c5a 100644 --- a/src/sage/combinat/partition.py +++ b/src/sage/combinat/partition.py @@ -1243,7 +1243,7 @@ def sign(self): REFERENCES: - - :wikipedia:`Zolotarev's_lemma` + - :wikipedia:`Zolotarev%27s_lemma` """ return (-1)**(self.size()-self.length()) diff --git a/src/sage/combinat/posets/posets.py b/src/sage/combinat/posets/posets.py index deac1eff88b..52d05189d74 100644 --- a/src/sage/combinat/posets/posets.py +++ b/src/sage/combinat/posets/posets.py @@ -4224,7 +4224,7 @@ def width(self, certificate=False): Return the width of the poset (the size of its longest antichain). It is computed through a matching in a bipartite graph; see - :wikipedia:`Dilworth's_theorem` for more information. The width is + :wikipedia:`Dilworth%27s_theorem` for more information. The width is also called Dilworth number. INPUT: @@ -4276,7 +4276,7 @@ def dilworth_decomposition(self): partitioned into `\alpha` chains, where `\alpha` is the cardinality of its largest antichain. This method returns such a partition. - See :wikipedia:`Dilworth's_theorem`. + See :wikipedia:`Dilworth%27s_theorem`. ALGORITHM: diff --git a/src/sage/combinat/root_system/plot.py b/src/sage/combinat/root_system/plot.py index 627f7875b50..3457339f7c0 100644 --- a/src/sage/combinat/root_system/plot.py +++ b/src/sage/combinat/root_system/plot.py @@ -141,7 +141,7 @@ One can also customize the projection by specifying a function. Here, we display all the roots for type `E_8` using the projection from its eight dimensional ambient space onto 3D described on -:wikipedia:`Wikipedia's E8 3D picture `:: +:wikipedia:`Wikipedia%27s E8 3D picture `:: sage: M = matrix([[0., -0.556793440452, 0.19694925177, -0.19694925177, 0.0805477263944, -0.385290876171, 0., 0.385290876171], ....: [0.180913155536, 0., 0.160212955043, 0.160212955043, 0., 0.0990170516545, 0.766360424875, 0.0990170516545], diff --git a/src/sage/functions/jacobi.py b/src/sage/functions/jacobi.py index 21fbec8bb93..b61892dda09 100644 --- a/src/sage/functions/jacobi.py +++ b/src/sage/functions/jacobi.py @@ -125,7 +125,7 @@ REFERENCES: -- :wikipedia:`Jacobi's_elliptic_functions` +- :wikipedia:`Jacobi%27s_elliptic_functions` - [KS2002]_ diff --git a/src/sage/geometry/riemannian_manifolds/surface3d_generators.py b/src/sage/geometry/riemannian_manifolds/surface3d_generators.py index 8bfbba189cb..078af43b338 100644 --- a/src/sage/geometry/riemannian_manifolds/surface3d_generators.py +++ b/src/sage/geometry/riemannian_manifolds/surface3d_generators.py @@ -114,7 +114,7 @@ def Dini(a=1, b=1, name="Dini's surface"): - ``name`` -- string. Name of the surface. - For more information, see :wikipedia:`Dini's_surface`. + For more information, see :wikipedia:`Dini%27s_surface`. EXAMPLES:: diff --git a/src/sage/graphs/base/static_sparse_graph.pyx b/src/sage/graphs/base/static_sparse_graph.pyx index 79a32ea523f..93c534f89e1 100644 --- a/src/sage/graphs/base/static_sparse_graph.pyx +++ b/src/sage/graphs/base/static_sparse_graph.pyx @@ -682,7 +682,7 @@ def tarjan_strongly_connected_components(G): the lowlink of `v`, that whole subtree is a new SCC. For more information, see the - :wikipedia:`Tarjan's_strongly_connected_components_algorithm`. + :wikipedia:`Tarjan%27s_strongly_connected_components_algorithm`. EXAMPLES:: diff --git a/src/sage/graphs/bipartite_graph.py b/src/sage/graphs/bipartite_graph.py index 744a6399231..b1a72081ecf 100644 --- a/src/sage/graphs/bipartite_graph.py +++ b/src/sage/graphs/bipartite_graph.py @@ -1634,7 +1634,7 @@ def vertex_cover(self, algorithm="Konig", value_only=False, among: - ``"Konig"`` will compute a minimum vertex cover using Konig's - algorithm (:wikipedia:`Kőnig's_theorem_(graph_theory)`) + algorithm (:wikipedia:`Kőnig%27s_theorem_(graph_theory)`) - ``"Cliquer"`` will compute a minimum vertex cover using the Cliquer package diff --git a/src/sage/graphs/generators/smallgraphs.py b/src/sage/graphs/generators/smallgraphs.py index 4f8a6732288..ee3a5a98d30 100644 --- a/src/sage/graphs/generators/smallgraphs.py +++ b/src/sage/graphs/generators/smallgraphs.py @@ -4327,7 +4327,7 @@ def TietzeGraph(): Return the Tietze Graph. For more information on the Tietze Graph, see the - :wikipedia:`Tietze's_graph`. + :wikipedia:`Tietze%27s_graph`. EXAMPLES:: diff --git a/src/sage/graphs/path_enumeration.pyx b/src/sage/graphs/path_enumeration.pyx index 5b252b06285..1cd0f172c46 100644 --- a/src/sage/graphs/path_enumeration.pyx +++ b/src/sage/graphs/path_enumeration.pyx @@ -617,7 +617,7 @@ def yen_k_shortest_simple_paths(self, source, target, weight_function=None, and `m` is the number of edges and `k` is the number of shortest paths needed to find. - See [Yen1970]_ and the :wikipedia:`Yen's_algorithm` for more details on the + See [Yen1970]_ and the :wikipedia:`Yen%27s_algorithm` for more details on the algorithm. EXAMPLES:: diff --git a/src/sage/graphs/spanning_tree.pyx b/src/sage/graphs/spanning_tree.pyx index 1572f35bac4..7c8b2597dec 100644 --- a/src/sage/graphs/spanning_tree.pyx +++ b/src/sage/graphs/spanning_tree.pyx @@ -401,7 +401,7 @@ def filter_kruskal(G, threshold=10000, weight_function=None, bint check=False): .. SEEALSO:: - :meth:`sage.graphs.generic_graph.GenericGraph.min_spanning_tree` - - :wikipedia:`Kruskal's_algorithm` + - :wikipedia:`Kruskal%27s_algorithm` - :func:`kruskal` - :func:`filter_kruskal_iterator` @@ -429,7 +429,7 @@ def filter_kruskal_iterator(G, threshold=10000, weight_function=None, bint check .. SEEALSO:: - :meth:`sage.graphs.generic_graph.GenericGraph.min_spanning_tree` - - :wikipedia:`Kruskal's_algorithm` + - :wikipedia:`Kruskal%27s_algorithm` - :func:`kruskal` - :func:`filter_kruskal` diff --git a/src/sage/groups/matrix_gps/finitely_generated.py b/src/sage/groups/matrix_gps/finitely_generated.py index d356c9cfc14..fec451070a0 100644 --- a/src/sage/groups/matrix_gps/finitely_generated.py +++ b/src/sage/groups/matrix_gps/finitely_generated.py @@ -48,7 +48,7 @@ - Volker Braun (2013-1) port to new Parent, libGAP. - Sebastian Oehms (2018-07): Added _permutation_group_element_ (Trac #25706) -- Sebastian Oehms (2019-01): Revision of :trac:`25706` (:trac:`26903`and :trac:`27143`). +- Sebastian Oehms (2019-01): Revision of :trac:`25706` (:trac:`26903` and :trac:`27143`). """ ############################################################################## diff --git a/src/sage/matroids/linear_matroid.pyx b/src/sage/matroids/linear_matroid.pyx index e72f7748d9e..bf354d86ab7 100644 --- a/src/sage/matroids/linear_matroid.pyx +++ b/src/sage/matroids/linear_matroid.pyx @@ -5870,7 +5870,7 @@ cdef class RegularMatroid(LinearMatroid): ALGORITHM: Since the matroid is regular, we use Kirchhoff's Matrix-Tree Theorem. - See also :wikipedia:`Kirchhoff's_theorem`. + See also :wikipedia:`Kirchhoff%27s_theorem`. """ if self._bases_count is None: R = self._basic_representation()._matrix_() diff --git a/src/sage/modules/free_module_element.pyx b/src/sage/modules/free_module_element.pyx index c0d39da6968..e60ae43cc40 100644 --- a/src/sage/modules/free_module_element.pyx +++ b/src/sage/modules/free_module_element.pyx @@ -2698,15 +2698,14 @@ cdef class FreeModuleElement(Vector): # abstract base class Return the matrix which describes a cross product between ``self`` and some other vector. - This operation is sometimes written using the `hat operator`_. + This operation is sometimes written using the hat operator: + see :wikipedia:`Hat_operator#Cross_product`. It is only defined for vectors of length 3 or 7. For a vector `v` the cross product matrix `\hat{v}` is a matrix which satisfies `\hat{v} \cdot w = v \times w` and also `w \cdot \hat{v} = w \times v` for all vectors `w`. The basis vectors are assumed to be orthonormal. - .. _hat operator: :wikipedia:`Hat_operator#Cross_product` - OUTPUT: The cross product matrix of this vector. diff --git a/src/sage/plot/plot3d/parametric_plot3d.py b/src/sage/plot/plot3d/parametric_plot3d.py index da98407f2a9..ee1a959a7bd 100644 --- a/src/sage/plot/plot3d/parametric_plot3d.py +++ b/src/sage/plot/plot3d/parametric_plot3d.py @@ -416,7 +416,7 @@ def g(x,y): return x, y+sin(y), x**2 + y**2 f_z = cos(u) / (1 + sqrt(2)) sphinx_plot(parametric_plot3d([f_x, f_y, f_z], (u,-pi,pi), (v,-pi,pi), frame=False, color="green")) - Boy's surface (:wikipedia:`Boy's_surface` and https://mathcurve.com/surfaces/boy/boy.shtml):: + Boy's surface (:wikipedia:`Boy%27s_surface` and https://mathcurve.com/surfaces/boy/boy.shtml):: sage: u, v = var('u,v') sage: K = cos(u) / (sqrt(2) - cos(2*u)*sin(3*v)) From 8f66113223b4925deea44bcdfc2f3bb6c58fa697 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Bissey?= Date: Sat, 23 May 2020 17:10:05 +1200 Subject: [PATCH 22/23] Minor upgdrade to Sphinx 3.0.3 --- build/pkgs/sphinx/checksums.ini | 6 +++--- build/pkgs/sphinx/package-version.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/pkgs/sphinx/checksums.ini b/build/pkgs/sphinx/checksums.ini index 37da471e1c9..a2150308444 100644 --- a/build/pkgs/sphinx/checksums.ini +++ b/build/pkgs/sphinx/checksums.ini @@ -1,5 +1,5 @@ tarball=Sphinx-VERSION.tar.gz -sha1=fd8b7655c4a01b3580a2abc216ff24c6776298b0 -md5=20a2f1f67d88fac3743c11def966c9a6 -cksum=2308785561 +sha1=781b9233902d92244be8f9537db3a4bd79a90df0 +md5=d5d0f61059c8ddb01b12e80a9e61adcb +cksum=3158798019 upstream_url=https://pypi.io/packages/source/s/sphinx/Sphinx-VERSION.tar.gz diff --git a/build/pkgs/sphinx/package-version.txt b/build/pkgs/sphinx/package-version.txt index 16f01e82efb..e8c8fdf4b74 100644 --- a/build/pkgs/sphinx/package-version.txt +++ b/build/pkgs/sphinx/package-version.txt @@ -1 +1 @@ -3.0.2.p0 +3.0.3.p0 From 321e2bf0cb7ab489ac7362eae607698c7ec37347 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Bissey?= Date: Tue, 9 Jun 2020 13:54:12 +1200 Subject: [PATCH 23/23] Bump to 3.0.4 --- build/pkgs/sphinx/checksums.ini | 6 +++--- build/pkgs/sphinx/package-version.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/pkgs/sphinx/checksums.ini b/build/pkgs/sphinx/checksums.ini index a2150308444..c7cb3178005 100644 --- a/build/pkgs/sphinx/checksums.ini +++ b/build/pkgs/sphinx/checksums.ini @@ -1,5 +1,5 @@ tarball=Sphinx-VERSION.tar.gz -sha1=781b9233902d92244be8f9537db3a4bd79a90df0 -md5=d5d0f61059c8ddb01b12e80a9e61adcb -cksum=3158798019 +sha1=deec61ab1240d359d24f6d08b28724b4f2547448 +md5=d998c1884c00cc93e9eede88e7864524 +cksum=4289730124 upstream_url=https://pypi.io/packages/source/s/sphinx/Sphinx-VERSION.tar.gz diff --git a/build/pkgs/sphinx/package-version.txt b/build/pkgs/sphinx/package-version.txt index e8c8fdf4b74..3da40e303a9 100644 --- a/build/pkgs/sphinx/package-version.txt +++ b/build/pkgs/sphinx/package-version.txt @@ -1 +1 @@ -3.0.3.p0 +3.0.4.p0