From 0e5b29a86c5d37f87a6ae9bf0b37c5bd3dd639a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20R=C3=BCth?= Date: Sun, 8 Jul 2018 00:58:30 +0200 Subject: [PATCH 01/10] Fix sphinxify for introspection where introspection/ has not been installed. --- src/doc/en/introspect/__init__.py | 1 - src/doc/en/introspect/conf.py | 20 ------------ src/doc/en/introspect/static/empty | 1 - src/doc/en/introspect/templates/layout.html | 3 -- src/sage/misc/sphinxify.py | 34 ++++++++++++++++++--- src/sage_setup/docbuild/build_options.py | 1 - 6 files changed, 29 insertions(+), 31 deletions(-) delete mode 100644 src/doc/en/introspect/__init__.py delete mode 100644 src/doc/en/introspect/conf.py delete mode 100644 src/doc/en/introspect/static/empty delete mode 100644 src/doc/en/introspect/templates/layout.html diff --git a/src/doc/en/introspect/__init__.py b/src/doc/en/introspect/__init__.py deleted file mode 100644 index 8b137891791..00000000000 --- a/src/doc/en/introspect/__init__.py +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/doc/en/introspect/conf.py b/src/doc/en/introspect/conf.py deleted file mode 100644 index 31815272f53..00000000000 --- a/src/doc/en/introspect/conf.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Sage introspection build configuration file. -# See sagenb.notebook.cell.Cell.set_introspect_html() for details. - -import sys, os -sys.path.append(os.environ['SAGE_DOC_SRC']) -from common.conf import * - -extensions = ['sphinx.ext.autodoc', 'sphinx.ext.mathjax', 'sphinx.ext.todo', - 'sphinx.ext.extlinks'] - -templates_path = ['templates'] -html_static_path = ['static'] - -html_use_modindex = False -html_use_index = False -html_split_index = False -html_copy_source = False - -todo_include_todos = True diff --git a/src/doc/en/introspect/static/empty b/src/doc/en/introspect/static/empty deleted file mode 100644 index 8b137891791..00000000000 --- a/src/doc/en/introspect/static/empty +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/doc/en/introspect/templates/layout.html b/src/doc/en/introspect/templates/layout.html deleted file mode 100644 index 2e17d5b0ab8..00000000000 --- a/src/doc/en/introspect/templates/layout.html +++ /dev/null @@ -1,3 +0,0 @@ -
- {% block body %} {% endblock %} -
diff --git a/src/sage/misc/sphinxify.py b/src/sage/misc/sphinxify.py index 8f426b59893..86de0c8b8c7 100644 --- a/src/sage/misc/sphinxify.py +++ b/src/sage/misc/sphinxify.py @@ -78,12 +78,36 @@ def sphinxify(docstring, format='html'): # Sphinx constructor: Sphinx(srcdir, confdir, outdir, doctreedir, # buildername, confoverrides, status, warning, freshenv). - confdir = os.path.join(SAGE_DOC_SRC, 'en', 'introspect') - - open(os.path.join(srcdir, 'docutils.conf'), 'w').write(r""" + confdir = os.path.join(srcdir, 'en' , 'introspect') + os.makedirs(confdir) + with open(os.path.join(confdir, 'conf.py'), 'w') as filed: + filed.write(r""" +extensions = ['sphinx.ext.autodoc', 'sphinx.ext.mathjax', 'sphinx.ext.todo', 'sphinx.ext.extlinks'] + +templates_path = ['templates'] +html_static_path = ['static'] + +html_use_modindex = False +html_use_index = False +html_split_index = False +html_copy_source = False + +todo_include_todos = True""") + templatesdir = os.path.join(confdir, 'templates') + os.makedirs(templatesdir) + with open(os.path.join(templatesdir, 'layout.html'), 'w') as filed: + filed.write(r""" +
+ {% block body %} {% endblock %} +
""") + staticdir = os.path.join(confdir, 'static') + os.makedirs(staticdir) + with open(os.path.join(staticdir, 'empty'), 'w') as filed: pass + + with open(os.path.join(srcdir, 'docutils.conf'), 'w') as filed: + filed.write(r""" [parsers] -smart_quotes = no -""") +smart_quotes = no""") doctreedir = os.path.join(srcdir, 'doctrees') confoverrides = {'html_context': {}, 'master_doc': 'docstring'} diff --git a/src/sage_setup/docbuild/build_options.py b/src/sage_setup/docbuild/build_options.py index 1168f025110..be9bc98f354 100644 --- a/src/sage_setup/docbuild/build_options.py +++ b/src/sage_setup/docbuild/build_options.py @@ -9,7 +9,6 @@ LANGUAGES = [d for d in os.listdir(SAGE_DOC_SRC) if re.match('^[a-z][a-z]$', d)] SPHINXOPTS = "" PAPER = "" -OMIT = ["introspect"] # docs/dirs to omit when listing and building 'all' if PAPER: PAPEROPTS = "-D latex_paper_size=" + PAPER From 8b519f5f344cc2256f0e94f5ad1092e49380964e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20R=C3=BCth?= Date: Mon, 8 Oct 2018 13:36:12 +0200 Subject: [PATCH 02/10] fix pyflakes error --- src/sage/misc/sphinxify.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/sage/misc/sphinxify.py b/src/sage/misc/sphinxify.py index 15f5085e85b..2fab8f376a6 100644 --- a/src/sage/misc/sphinxify.py +++ b/src/sage/misc/sphinxify.py @@ -22,7 +22,6 @@ import re import shutil from tempfile import mkdtemp -from sage.env import SAGE_DOC_SRC from sphinx.application import Sphinx From 8c770a707bc9b3e050a9868dccc559948cb86339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20R=C3=BCth?= Date: Tue, 18 Jun 2019 23:32:29 +0200 Subject: [PATCH 03/10] Restore OMIT that is needed by the build --- src/sage_setup/docbuild/build_options.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/sage_setup/docbuild/build_options.py b/src/sage_setup/docbuild/build_options.py index 9962a86010e..ddc88a39f0e 100644 --- a/src/sage_setup/docbuild/build_options.py +++ b/src/sage_setup/docbuild/build_options.py @@ -9,6 +9,7 @@ LANGUAGES = [d for d in os.listdir(SAGE_DOC_SRC) if re.match('^[a-z][a-z]$', d)] SPHINXOPTS = "" PAPER = "" +OMIT = ["introspect"] # docs/dirs to omit when listing and building 'all' if PAPER: PAPEROPTS = "-D latex_paper_size=" + PAPER From 118b96416fcd593a24650237808fcd558324605f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20R=C3=BCth?= Date: Fri, 28 Jun 2019 14:14:09 +0200 Subject: [PATCH 04/10] Attempt to fix failing doctests I have no clue why doctests are failing here. My previous changes introduced an extra newline here, maybe that is strangely the problem. --- src/sage/misc/sphinxify.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/sage/misc/sphinxify.py b/src/sage/misc/sphinxify.py index c2130dfdd80..fa62413925f 100644 --- a/src/sage/misc/sphinxify.py +++ b/src/sage/misc/sphinxify.py @@ -99,8 +99,7 @@ def sphinxify(docstring, format='html'): templatesdir = os.path.join(confdir, 'templates') os.makedirs(templatesdir) with open(os.path.join(templatesdir, 'layout.html'), 'w') as filed: - filed.write(r""" -
+ filed.write(r"""
{% block body %} {% endblock %}
""") staticdir = os.path.join(confdir, 'static') From 863d433d402c9257768929f7d62c4bd478eabbc8 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 16 Jul 2019 05:08:01 +0000 Subject: [PATCH 05/10] mv src/doc/common/*.py to src/sage/docs/conf --- src/doc/ca/intro/conf.py | 4 +--- src/doc/de/a_tour_of_sage/conf.py | 4 +--- src/doc/de/thematische_anleitungen/conf.py | 4 +--- src/doc/de/tutorial/conf.py | 4 +--- src/doc/en/a_tour_of_sage/conf.py | 4 +--- src/doc/en/constructions/conf.py | 4 +--- src/doc/en/developer/conf.py | 4 +--- src/doc/en/faq/conf.py | 4 +--- src/doc/en/installation/conf.py | 4 +--- src/doc/en/prep/conf.py | 4 +--- src/doc/en/reference/conf.py | 3 +-- src/doc/en/reference/conf_sub.py | 3 +-- src/doc/en/thematic_tutorials/conf.py | 4 +--- .../explicit_methods_in_number_theory/conf.py | 4 +--- src/doc/en/thematic_tutorials/numerical_sage/conf.py | 4 +--- src/doc/en/tutorial/conf.py | 4 +--- src/doc/en/website/conf.py | 4 +--- src/doc/es/a_tour_of_sage/conf.py | 4 +--- src/doc/es/tutorial/conf.py | 4 +--- src/doc/fr/a_tour_of_sage/conf.py | 4 +--- src/doc/fr/tutorial/conf.py | 4 +--- src/doc/hu/a_tour_of_sage/conf.py | 4 +--- src/doc/it/a_tour_of_sage/conf.py | 4 +--- src/doc/ja/a_tour_of_sage/conf.py | 4 +--- src/doc/ja/tutorial/conf.py | 4 +--- src/doc/pt/a_tour_of_sage/conf.py | 4 +--- src/doc/pt/tutorial/conf.py | 4 +--- src/doc/ru/tutorial/conf.py | 4 +--- src/doc/tr/a_tour_of_sage/conf.py | 4 +--- src/{doc/common => sage/docs/conf}/__init__.py | 0 src/{doc/common => sage/docs/conf}/conf.py | 0 src/sage/misc/sphinxify.py | 1 + src/sage_setup/docbuild/__init__.py | 3 +-- 33 files changed, 31 insertions(+), 87 deletions(-) rename src/{doc/common => sage/docs/conf}/__init__.py (100%) rename src/{doc/common => sage/docs/conf}/conf.py (100%) diff --git a/src/doc/ca/intro/conf.py b/src/doc/ca/intro/conf.py index f77af7c5435..8b35854cdbc 100644 --- a/src/doc/ca/intro/conf.py +++ b/src/doc/ca/intro/conf.py @@ -12,9 +12,7 @@ # serve to show the default. import sys, os -from sage.env import SAGE_DOC_SRC -sys.path.append(SAGE_DOC_SRC) -from common.conf import * +from sage.docs.conf.conf import * # General information about the project. project = u"Introducció de Sage" diff --git a/src/doc/de/a_tour_of_sage/conf.py b/src/doc/de/a_tour_of_sage/conf.py index e84e90f2823..65b9ea338f5 100644 --- a/src/doc/de/a_tour_of_sage/conf.py +++ b/src/doc/de/a_tour_of_sage/conf.py @@ -14,9 +14,7 @@ # serve to show the default. import sys, os -from sage.env import SAGE_DOC_SRC -sys.path.append(SAGE_DOC_SRC) -from common.conf import * +from sage.docs.conf.conf import * # General information about the project. project = u"Ein Rundgang durch Sage" diff --git a/src/doc/de/thematische_anleitungen/conf.py b/src/doc/de/thematische_anleitungen/conf.py index 06da30677e8..5da10dcc443 100644 --- a/src/doc/de/thematische_anleitungen/conf.py +++ b/src/doc/de/thematische_anleitungen/conf.py @@ -12,9 +12,7 @@ # serve to show the default. import sys, os -from sage.env import SAGE_DOC_SRC -sys.path.append(SAGE_DOC_SRC) -from common.conf import * +from sage.docs.conf.conf import * # General information about the project. project = u"Thematische Anleitungen" diff --git a/src/doc/de/tutorial/conf.py b/src/doc/de/tutorial/conf.py index b6762642b91..433674c4757 100644 --- a/src/doc/de/tutorial/conf.py +++ b/src/doc/de/tutorial/conf.py @@ -12,9 +12,7 @@ # serve to show the default. import sys, os -from sage.env import SAGE_DOC_SRC -sys.path.append(SAGE_DOC_SRC) -from common.conf import * +from sage.docs.conf.conf import * # General information about the project. project = u"Sage Tutorial" diff --git a/src/doc/en/a_tour_of_sage/conf.py b/src/doc/en/a_tour_of_sage/conf.py index cf0d96182ee..326934ddf69 100644 --- a/src/doc/en/a_tour_of_sage/conf.py +++ b/src/doc/en/a_tour_of_sage/conf.py @@ -12,9 +12,7 @@ # serve to show the default. import sys, os -from sage.env import SAGE_DOC_SRC -sys.path.append(SAGE_DOC_SRC) -from common.conf import * +from sage.docs.conf.conf import * # General information about the project. project = u'A Tour of Sage' diff --git a/src/doc/en/constructions/conf.py b/src/doc/en/constructions/conf.py index 3a3e83309cb..ef971d1d086 100644 --- a/src/doc/en/constructions/conf.py +++ b/src/doc/en/constructions/conf.py @@ -12,9 +12,7 @@ # serve to show the default. import sys, os -from sage.env import SAGE_DOC_SRC -sys.path.append(SAGE_DOC_SRC) -from common.conf import * +from sage.docs.conf.conf import * # General information about the project. project = u"Sage Constructions" diff --git a/src/doc/en/developer/conf.py b/src/doc/en/developer/conf.py index 62b5399b39d..380b47f9582 100644 --- a/src/doc/en/developer/conf.py +++ b/src/doc/en/developer/conf.py @@ -12,9 +12,7 @@ # serve to show the default. import sys, os -from sage.env import SAGE_DOC_SRC -sys.path.append(SAGE_DOC_SRC) -from common.conf import * +from sage.docs.conf.conf import * # General information about the project. project = u"Sage Developer's Guide" diff --git a/src/doc/en/faq/conf.py b/src/doc/en/faq/conf.py index 343dddedfc4..dfe3e4b2e5c 100644 --- a/src/doc/en/faq/conf.py +++ b/src/doc/en/faq/conf.py @@ -16,9 +16,7 @@ import os import sys -from sage.env import SAGE_DOC_SRC -sys.path.append(SAGE_DOC_SRC) -from common.conf import * +from sage.docs.conf.conf import * # General information about the project. project = u"Sage FAQ" diff --git a/src/doc/en/installation/conf.py b/src/doc/en/installation/conf.py index 968c67255b7..18085404ae1 100644 --- a/src/doc/en/installation/conf.py +++ b/src/doc/en/installation/conf.py @@ -12,9 +12,7 @@ # serve to show the default. import sys, os -from sage.env import SAGE_DOC_SRC -sys.path.append(SAGE_DOC_SRC) -from common.conf import * +from sage.docs.conf.conf import * # General information about the project. project = u"Sage Installation Guide" diff --git a/src/doc/en/prep/conf.py b/src/doc/en/prep/conf.py index d13fbb82f65..64bcb3e5da0 100644 --- a/src/doc/en/prep/conf.py +++ b/src/doc/en/prep/conf.py @@ -12,9 +12,7 @@ # serve to show the default. import sys, os -from sage.env import SAGE_DOC_SRC -sys.path.append(SAGE_DOC_SRC) -from common.conf import * +from sage.docs.conf.conf import * # General information about the project. diff --git a/src/doc/en/reference/conf.py b/src/doc/en/reference/conf.py index 9e557175453..f0464daa1d1 100644 --- a/src/doc/en/reference/conf.py +++ b/src/doc/en/reference/conf.py @@ -13,8 +13,7 @@ import sys, os from sage.env import SAGE_DOC_SRC, SAGE_DOC -sys.path.append(SAGE_DOC_SRC) -from common.conf import * +from sage.docs.conf.conf import * ref_src = os.path.join(SAGE_DOC_SRC, 'en', 'reference') ref_out = os.path.join(SAGE_DOC, 'html', 'en', 'reference') diff --git a/src/doc/en/reference/conf_sub.py b/src/doc/en/reference/conf_sub.py index 76f6e129097..ae3c398c5e0 100644 --- a/src/doc/en/reference/conf_sub.py +++ b/src/doc/en/reference/conf_sub.py @@ -13,8 +13,7 @@ import sys, os from sage.env import SAGE_DOC_SRC, SAGE_DOC -sys.path.append(SAGE_DOC_SRC) -from common.conf import * +from sage.docs.conf.conf import * from six.moves import range diff --git a/src/doc/en/thematic_tutorials/conf.py b/src/doc/en/thematic_tutorials/conf.py index 9d9afac6fde..647d8d68563 100644 --- a/src/doc/en/thematic_tutorials/conf.py +++ b/src/doc/en/thematic_tutorials/conf.py @@ -15,9 +15,7 @@ import os import sys -from sage.env import SAGE_DOC_SRC -sys.path.append(SAGE_DOC_SRC) -from common.conf import * +from sage.docs.conf.conf import * # General information about the project. project = u"Thematic Tutorials" diff --git a/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/conf.py b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/conf.py index d057dc7ef7a..5bdf5a3da9f 100644 --- a/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/conf.py +++ b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/conf.py @@ -12,9 +12,7 @@ # serve to show the default. import sys, os -from sage.env import SAGE_DOC_SRC -sys.path.append(SAGE_DOC_SRC) -from common.conf import * +from sage.docs.conf.conf import * # General information about the project. name = 'bordeaux_2008' diff --git a/src/doc/en/thematic_tutorials/numerical_sage/conf.py b/src/doc/en/thematic_tutorials/numerical_sage/conf.py index 69eec5d744f..b8152860d61 100644 --- a/src/doc/en/thematic_tutorials/numerical_sage/conf.py +++ b/src/doc/en/thematic_tutorials/numerical_sage/conf.py @@ -12,9 +12,7 @@ # serve to show the default. import sys, os -from sage.env import SAGE_DOC_SRC -sys.path.append(SAGE_DOC_SRC) -from common.conf import * +from sage.docs.conf.conf import * # General information about the project. project = u'Numerical Computing with Sage' diff --git a/src/doc/en/tutorial/conf.py b/src/doc/en/tutorial/conf.py index f5a512dda7a..f6964685382 100644 --- a/src/doc/en/tutorial/conf.py +++ b/src/doc/en/tutorial/conf.py @@ -12,9 +12,7 @@ # serve to show the default. import sys, os -from sage.env import SAGE_DOC_SRC -sys.path.append(SAGE_DOC_SRC) -from common.conf import * +from sage.docs.conf.conf import * # General information about the project. project = u"Sage Tutorial" diff --git a/src/doc/en/website/conf.py b/src/doc/en/website/conf.py index 53a521ef218..ee08a300ac2 100644 --- a/src/doc/en/website/conf.py +++ b/src/doc/en/website/conf.py @@ -12,9 +12,7 @@ # serve to show the default. import sys, os -from sage.env import SAGE_DOC_SRC -sys.path.append(SAGE_DOC_SRC) -from common.conf import * +from sage.docs.conf.conf import * # General information about the project. project = u'Sage Documentation' diff --git a/src/doc/es/a_tour_of_sage/conf.py b/src/doc/es/a_tour_of_sage/conf.py index 1e536d4ede4..3b8839e74bf 100644 --- a/src/doc/es/a_tour_of_sage/conf.py +++ b/src/doc/es/a_tour_of_sage/conf.py @@ -15,9 +15,7 @@ import sys import os -from sage.env import SAGE_DOC_SRC -sys.path.append(SAGE_DOC_SRC) -from common.conf import * +from sage.docs.conf.conf import * # General information about the project. project = u'Un Tour Por Sage' diff --git a/src/doc/es/tutorial/conf.py b/src/doc/es/tutorial/conf.py index e361a063a2f..f093ad161ff 100644 --- a/src/doc/es/tutorial/conf.py +++ b/src/doc/es/tutorial/conf.py @@ -13,9 +13,7 @@ import sys import os -from sage.env import SAGE_DOC_SRC -sys.path.append(SAGE_DOC_SRC) -from common.conf import * +from sage.docs.conf.conf import * # General information about the project. project = u"Sage Tutorial" diff --git a/src/doc/fr/a_tour_of_sage/conf.py b/src/doc/fr/a_tour_of_sage/conf.py index 5d362719c4b..5a5c76c713b 100644 --- a/src/doc/fr/a_tour_of_sage/conf.py +++ b/src/doc/fr/a_tour_of_sage/conf.py @@ -12,9 +12,7 @@ # serve to show the default. import sys, os -from sage.env import SAGE_DOC_SRC -sys.path.append(SAGE_DOC_SRC) -from common.conf import * +from sage.docs.conf.conf import * # General information about the project. project = u'Sage en quelques mots' diff --git a/src/doc/fr/tutorial/conf.py b/src/doc/fr/tutorial/conf.py index 121541d40ef..6ccbde2dd39 100644 --- a/src/doc/fr/tutorial/conf.py +++ b/src/doc/fr/tutorial/conf.py @@ -12,9 +12,7 @@ # serve to show the default. import sys, os -from sage.env import SAGE_DOC_SRC -sys.path.append(SAGE_DOC_SRC) -from common.conf import * +from sage.docs.conf.conf import * # General information about the project. project = u"Tutoriel Sage" diff --git a/src/doc/hu/a_tour_of_sage/conf.py b/src/doc/hu/a_tour_of_sage/conf.py index 4e8f4817e17..b215b5f08aa 100644 --- a/src/doc/hu/a_tour_of_sage/conf.py +++ b/src/doc/hu/a_tour_of_sage/conf.py @@ -14,9 +14,7 @@ # out serve to show the default. import sys, os -from sage.env import SAGE_DOC_SRC -sys.path.append(SAGE_DOC_SRC) -from common.conf import * +from sage.docs.conf.conf import * # General information about the project. project = u'A Sage bemutatása' diff --git a/src/doc/it/a_tour_of_sage/conf.py b/src/doc/it/a_tour_of_sage/conf.py index ffc0de001b9..adc479ead2c 100644 --- a/src/doc/it/a_tour_of_sage/conf.py +++ b/src/doc/it/a_tour_of_sage/conf.py @@ -12,9 +12,7 @@ # serve to show the default. import sys, os -from sage.env import SAGE_DOC_SRC -sys.path.append(SAGE_DOC_SRC) -from common.conf import * +from sage.docs.conf.conf import * # General information about the project. project = u'Esplora Sage' diff --git a/src/doc/ja/a_tour_of_sage/conf.py b/src/doc/ja/a_tour_of_sage/conf.py index dfa03db1c89..ef987b70da3 100644 --- a/src/doc/ja/a_tour_of_sage/conf.py +++ b/src/doc/ja/a_tour_of_sage/conf.py @@ -12,9 +12,7 @@ # serve to show the default. import sys, os -from sage.env import SAGE_DOC_SRC -sys.path.append(SAGE_DOC_SRC) -from common.conf import * +from sage.docs.conf.conf import * # General information about the project. project = u"Sage ガイドツアー" diff --git a/src/doc/ja/tutorial/conf.py b/src/doc/ja/tutorial/conf.py index c136e8d5e85..67e5e2944b0 100644 --- a/src/doc/ja/tutorial/conf.py +++ b/src/doc/ja/tutorial/conf.py @@ -12,9 +12,7 @@ # serve to show the default. import sys, os -from sage.env import SAGE_DOC_SRC -sys.path.append(SAGE_DOC_SRC) -from common.conf import * +from sage.docs.conf.conf import * # General information about the project. project = u"Sage チュートリアル" diff --git a/src/doc/pt/a_tour_of_sage/conf.py b/src/doc/pt/a_tour_of_sage/conf.py index 3cbd4c99cb9..4b95c808e84 100644 --- a/src/doc/pt/a_tour_of_sage/conf.py +++ b/src/doc/pt/a_tour_of_sage/conf.py @@ -12,9 +12,7 @@ # serve to show the default. import sys, os -from sage.env import SAGE_DOC_SRC -sys.path.append(SAGE_DOC_SRC) -from common.conf import * +from sage.docs.conf.conf import * # General information about the project. project = u'Uma Turnê pelo Sage' diff --git a/src/doc/pt/tutorial/conf.py b/src/doc/pt/tutorial/conf.py index c2ce9a5e8b7..3cc199e1137 100644 --- a/src/doc/pt/tutorial/conf.py +++ b/src/doc/pt/tutorial/conf.py @@ -12,9 +12,7 @@ # serve to show the default. import sys, os -from sage.env import SAGE_DOC_SRC -sys.path.append(SAGE_DOC_SRC) -from common.conf import * +from sage.docs.conf.conf import * # General information about the project. project = u"Tutorial Sage" diff --git a/src/doc/ru/tutorial/conf.py b/src/doc/ru/tutorial/conf.py index 3100349ad3b..f677e0df3ec 100644 --- a/src/doc/ru/tutorial/conf.py +++ b/src/doc/ru/tutorial/conf.py @@ -12,9 +12,7 @@ # serve to show the default. import sys, os -from sage.env import SAGE_DOC_SRC -sys.path.append(SAGE_DOC_SRC) -from common.conf import * +from sage.docs.conf.conf import * # General information about the project. project = u"Sage Tutorial in Russian" diff --git a/src/doc/tr/a_tour_of_sage/conf.py b/src/doc/tr/a_tour_of_sage/conf.py index b2615603799..6e9d2f38b44 100644 --- a/src/doc/tr/a_tour_of_sage/conf.py +++ b/src/doc/tr/a_tour_of_sage/conf.py @@ -12,9 +12,7 @@ # serve to show the default. import sys, os -from sage.env import SAGE_DOC_SRC -sys.path.append(SAGE_DOC_SRC) -from common.conf import * +from sage.docs.conf.conf import * # General information about the project. project = u'Sage Turu' diff --git a/src/doc/common/__init__.py b/src/sage/docs/conf/__init__.py similarity index 100% rename from src/doc/common/__init__.py rename to src/sage/docs/conf/__init__.py diff --git a/src/doc/common/conf.py b/src/sage/docs/conf/conf.py similarity index 100% rename from src/doc/common/conf.py rename to src/sage/docs/conf/conf.py diff --git a/src/sage/misc/sphinxify.py b/src/sage/misc/sphinxify.py index fa62413925f..51d5fb0b47b 100644 --- a/src/sage/misc/sphinxify.py +++ b/src/sage/misc/sphinxify.py @@ -85,6 +85,7 @@ def sphinxify(docstring, format='html'): os.makedirs(confdir) with open(os.path.join(confdir, 'conf.py'), 'w') as filed: filed.write(r""" +from sage.docs.conf.conf import * extensions = ['sphinx.ext.autodoc', 'sphinx.ext.mathjax', 'sphinx.ext.todo', 'sphinx.ext.extlinks'] templates_path = ['templates'] diff --git a/src/sage_setup/docbuild/__init__.py b/src/sage_setup/docbuild/__init__.py index 2fa23276ba6..c650f6b2651 100644 --- a/src/sage_setup/docbuild/__init__.py +++ b/src/sage_setup/docbuild/__init__.py @@ -1174,9 +1174,8 @@ def __init__(self, path): # This file is automatically generated by {}, do not edit! import sys, os -sys.path.append(os.environ['SAGE_DOC_SRC']) sys.path.append({!r}) -from common.conf import * +from sage.docs.conf.conf import * project = u'Documentation for {}' release = 'unknown' name = {!r} From 5c63a8079c96a2ca87d8cea1cace10c7e364e831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20R=C3=BCth?= Date: Tue, 16 Jul 2019 08:39:16 +0200 Subject: [PATCH 06/10] Fix mention of common/conf.py since it has moved --- src/sage/misc/latex_macros.py | 2 +- src/sage/misc/sagedoc.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sage/misc/latex_macros.py b/src/sage/misc/latex_macros.py index a9e4b5df340..dc4548016d9 100644 --- a/src/sage/misc/latex_macros.py +++ b/src/sage/misc/latex_macros.py @@ -14,7 +14,7 @@ the ``_latex_`` method for each Sage object listed in ``macros``, and the MathJax macros are produced from the LaTeX macros. The list of LaTeX macros is used in the file -``SAGE_DOC_SRC/common/conf.py`` to add to the preambles of +``sage.docs.conf`` to add to the preambles of both the LaTeX file used to build the PDF version of the documentation and the LaTeX file used to build the HTML version. The list of MathJax macros is used in the file diff --git a/src/sage/misc/sagedoc.py b/src/sage/misc/sagedoc.py index bf4bf5f8256..35f0e74bcee 100644 --- a/src/sage/misc/sagedoc.py +++ b/src/sage/misc/sagedoc.py @@ -491,7 +491,7 @@ def process_extlinks(s, embedded=False): Sphinx extlinks extension. For example, replace ``:trac:`NUM``` with ``https://trac.sagemath.org/NUM``, and similarly with ``:python:TEXT`` and ``:wikipedia:TEXT``, looking up the url from - the dictionary ``extlinks`` in SAGE_DOC_SRC/common/conf.py. + the dictionary ``extlinks`` in ``sage.docs.conf``. If ``TEXT`` is of the form ``blah ``, then it uses ``LINK`` rather than ``TEXT`` to construct the url. From edd3ab4efc393d639bb83fe6bd176557c8386fef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20R=C3=BCth?= Date: Tue, 16 Jul 2019 08:43:06 +0200 Subject: [PATCH 07/10] Replace conf.conf with conf --- build/pkgs/lcalc/patches/pari-mem.patch | 4 ++-- src/doc/ca/intro/conf.py | 2 +- src/doc/de/a_tour_of_sage/conf.py | 2 +- src/doc/de/thematische_anleitungen/conf.py | 2 +- src/doc/de/tutorial/conf.py | 2 +- src/doc/en/a_tour_of_sage/conf.py | 2 +- src/doc/en/constructions/conf.py | 2 +- src/doc/en/developer/conf.py | 2 +- src/doc/en/faq/conf.py | 2 +- src/doc/en/installation/conf.py | 2 +- src/doc/en/prep/conf.py | 2 +- src/doc/en/reference/conf.py | 2 +- src/doc/en/reference/conf_sub.py | 2 +- src/doc/en/thematic_tutorials/conf.py | 2 +- .../explicit_methods_in_number_theory/conf.py | 2 +- src/doc/en/thematic_tutorials/numerical_sage/conf.py | 2 +- src/doc/en/tutorial/conf.py | 2 +- src/doc/en/website/conf.py | 2 +- src/doc/es/a_tour_of_sage/conf.py | 2 +- src/doc/es/tutorial/conf.py | 2 +- src/doc/fr/a_tour_of_sage/conf.py | 2 +- src/doc/fr/tutorial/conf.py | 2 +- src/doc/hu/a_tour_of_sage/conf.py | 2 +- src/doc/it/a_tour_of_sage/conf.py | 2 +- src/doc/ja/a_tour_of_sage/conf.py | 2 +- src/doc/ja/tutorial/conf.py | 2 +- src/doc/pt/a_tour_of_sage/conf.py | 2 +- src/doc/pt/tutorial/conf.py | 2 +- src/doc/ru/tutorial/conf.py | 2 +- src/doc/tr/a_tour_of_sage/conf.py | 2 +- src/sage/docs/{conf => }/conf.py | 0 src/sage/docs/conf/__init__.py | 0 src/sage/misc/sphinxify.py | 2 +- src/sage_setup/docbuild/__init__.py | 2 +- 34 files changed, 33 insertions(+), 33 deletions(-) rename src/sage/docs/{conf => }/conf.py (100%) delete mode 100644 src/sage/docs/conf/__init__.py diff --git a/build/pkgs/lcalc/patches/pari-mem.patch b/build/pkgs/lcalc/patches/pari-mem.patch index 1566681a909..fedd3dea59e 100644 --- a/build/pkgs/lcalc/patches/pari-mem.patch +++ b/build/pkgs/lcalc/patches/pari-mem.patch @@ -5,9 +5,9 @@ with the 16MB in this patch See https://trac.sagemath.org/ticket/24516 -diff -ru lcalc-1.23/src/Lcommandline.cc lcalc-1.23-patched//src/Lcommandline.cc +diff -ru lcalc-1.23/src/Lcommandline.cc lcalc-1.23-patched/src/Lcommandline.cc --- lcalc-1.23/src/Lcommandline.cc 2012-08-08 23:21:56.000000000 +0200 -+++ lcalc-1.23-patched//src/Lcommandline.cc 2018-01-30 11:23:06.975418539 +0100 ++++ lcalc-1.23-patched/src/Lcommandline.cc 2018-01-30 11:23:06.975418539 +0100 @@ -412,12 +412,7 @@ t2=.5; //t2=.5 because of the GAMMA(s+1/2) diff --git a/src/doc/ca/intro/conf.py b/src/doc/ca/intro/conf.py index 8b35854cdbc..8af3ab5f0df 100644 --- a/src/doc/ca/intro/conf.py +++ b/src/doc/ca/intro/conf.py @@ -12,7 +12,7 @@ # serve to show the default. import sys, os -from sage.docs.conf.conf import * +from sage.docs.conf import * # General information about the project. project = u"Introducció de Sage" diff --git a/src/doc/de/a_tour_of_sage/conf.py b/src/doc/de/a_tour_of_sage/conf.py index 65b9ea338f5..a1bfabb1627 100644 --- a/src/doc/de/a_tour_of_sage/conf.py +++ b/src/doc/de/a_tour_of_sage/conf.py @@ -14,7 +14,7 @@ # serve to show the default. import sys, os -from sage.docs.conf.conf import * +from sage.docs.conf import * # General information about the project. project = u"Ein Rundgang durch Sage" diff --git a/src/doc/de/thematische_anleitungen/conf.py b/src/doc/de/thematische_anleitungen/conf.py index 5da10dcc443..982ec36a99d 100644 --- a/src/doc/de/thematische_anleitungen/conf.py +++ b/src/doc/de/thematische_anleitungen/conf.py @@ -12,7 +12,7 @@ # serve to show the default. import sys, os -from sage.docs.conf.conf import * +from sage.docs.conf import * # General information about the project. project = u"Thematische Anleitungen" diff --git a/src/doc/de/tutorial/conf.py b/src/doc/de/tutorial/conf.py index 433674c4757..24576da4c08 100644 --- a/src/doc/de/tutorial/conf.py +++ b/src/doc/de/tutorial/conf.py @@ -12,7 +12,7 @@ # serve to show the default. import sys, os -from sage.docs.conf.conf import * +from sage.docs.conf import * # General information about the project. project = u"Sage Tutorial" diff --git a/src/doc/en/a_tour_of_sage/conf.py b/src/doc/en/a_tour_of_sage/conf.py index 326934ddf69..a0a46bffde8 100644 --- a/src/doc/en/a_tour_of_sage/conf.py +++ b/src/doc/en/a_tour_of_sage/conf.py @@ -12,7 +12,7 @@ # serve to show the default. import sys, os -from sage.docs.conf.conf import * +from sage.docs.conf import * # General information about the project. project = u'A Tour of Sage' diff --git a/src/doc/en/constructions/conf.py b/src/doc/en/constructions/conf.py index ef971d1d086..250aced402a 100644 --- a/src/doc/en/constructions/conf.py +++ b/src/doc/en/constructions/conf.py @@ -12,7 +12,7 @@ # serve to show the default. import sys, os -from sage.docs.conf.conf import * +from sage.docs.conf import * # General information about the project. project = u"Sage Constructions" diff --git a/src/doc/en/developer/conf.py b/src/doc/en/developer/conf.py index 380b47f9582..b5fb77be5a3 100644 --- a/src/doc/en/developer/conf.py +++ b/src/doc/en/developer/conf.py @@ -12,7 +12,7 @@ # serve to show the default. import sys, os -from sage.docs.conf.conf import * +from sage.docs.conf import * # General information about the project. project = u"Sage Developer's Guide" diff --git a/src/doc/en/faq/conf.py b/src/doc/en/faq/conf.py index dfe3e4b2e5c..a5d6746375f 100644 --- a/src/doc/en/faq/conf.py +++ b/src/doc/en/faq/conf.py @@ -16,7 +16,7 @@ import os import sys -from sage.docs.conf.conf import * +from sage.docs.conf import * # General information about the project. project = u"Sage FAQ" diff --git a/src/doc/en/installation/conf.py b/src/doc/en/installation/conf.py index 18085404ae1..f4adce8ad26 100644 --- a/src/doc/en/installation/conf.py +++ b/src/doc/en/installation/conf.py @@ -12,7 +12,7 @@ # serve to show the default. import sys, os -from sage.docs.conf.conf import * +from sage.docs.conf import * # General information about the project. project = u"Sage Installation Guide" diff --git a/src/doc/en/prep/conf.py b/src/doc/en/prep/conf.py index 64bcb3e5da0..5b3d2171a0b 100644 --- a/src/doc/en/prep/conf.py +++ b/src/doc/en/prep/conf.py @@ -12,7 +12,7 @@ # serve to show the default. import sys, os -from sage.docs.conf.conf import * +from sage.docs.conf import * # General information about the project. diff --git a/src/doc/en/reference/conf.py b/src/doc/en/reference/conf.py index f0464daa1d1..136d5f7661c 100644 --- a/src/doc/en/reference/conf.py +++ b/src/doc/en/reference/conf.py @@ -13,7 +13,7 @@ import sys, os from sage.env import SAGE_DOC_SRC, SAGE_DOC -from sage.docs.conf.conf import * +from sage.docs.conf import * ref_src = os.path.join(SAGE_DOC_SRC, 'en', 'reference') ref_out = os.path.join(SAGE_DOC, 'html', 'en', 'reference') diff --git a/src/doc/en/reference/conf_sub.py b/src/doc/en/reference/conf_sub.py index ae3c398c5e0..d126f8758ac 100644 --- a/src/doc/en/reference/conf_sub.py +++ b/src/doc/en/reference/conf_sub.py @@ -13,7 +13,7 @@ import sys, os from sage.env import SAGE_DOC_SRC, SAGE_DOC -from sage.docs.conf.conf import * +from sage.docs.conf import * from six.moves import range diff --git a/src/doc/en/thematic_tutorials/conf.py b/src/doc/en/thematic_tutorials/conf.py index 647d8d68563..32ae7692d25 100644 --- a/src/doc/en/thematic_tutorials/conf.py +++ b/src/doc/en/thematic_tutorials/conf.py @@ -15,7 +15,7 @@ import os import sys -from sage.docs.conf.conf import * +from sage.docs.conf import * # General information about the project. project = u"Thematic Tutorials" diff --git a/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/conf.py b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/conf.py index 5bdf5a3da9f..0a6359ffe90 100644 --- a/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/conf.py +++ b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/conf.py @@ -12,7 +12,7 @@ # serve to show the default. import sys, os -from sage.docs.conf.conf import * +from sage.docs.conf import * # General information about the project. name = 'bordeaux_2008' diff --git a/src/doc/en/thematic_tutorials/numerical_sage/conf.py b/src/doc/en/thematic_tutorials/numerical_sage/conf.py index b8152860d61..af0cec3211c 100644 --- a/src/doc/en/thematic_tutorials/numerical_sage/conf.py +++ b/src/doc/en/thematic_tutorials/numerical_sage/conf.py @@ -12,7 +12,7 @@ # serve to show the default. import sys, os -from sage.docs.conf.conf import * +from sage.docs.conf import * # General information about the project. project = u'Numerical Computing with Sage' diff --git a/src/doc/en/tutorial/conf.py b/src/doc/en/tutorial/conf.py index f6964685382..bdd2656bf8f 100644 --- a/src/doc/en/tutorial/conf.py +++ b/src/doc/en/tutorial/conf.py @@ -12,7 +12,7 @@ # serve to show the default. import sys, os -from sage.docs.conf.conf import * +from sage.docs.conf import * # General information about the project. project = u"Sage Tutorial" diff --git a/src/doc/en/website/conf.py b/src/doc/en/website/conf.py index ee08a300ac2..df1981659f9 100644 --- a/src/doc/en/website/conf.py +++ b/src/doc/en/website/conf.py @@ -12,7 +12,7 @@ # serve to show the default. import sys, os -from sage.docs.conf.conf import * +from sage.docs.conf import * # General information about the project. project = u'Sage Documentation' diff --git a/src/doc/es/a_tour_of_sage/conf.py b/src/doc/es/a_tour_of_sage/conf.py index 3b8839e74bf..9bc13c66501 100644 --- a/src/doc/es/a_tour_of_sage/conf.py +++ b/src/doc/es/a_tour_of_sage/conf.py @@ -15,7 +15,7 @@ import sys import os -from sage.docs.conf.conf import * +from sage.docs.conf import * # General information about the project. project = u'Un Tour Por Sage' diff --git a/src/doc/es/tutorial/conf.py b/src/doc/es/tutorial/conf.py index f093ad161ff..0a9616b4c3d 100644 --- a/src/doc/es/tutorial/conf.py +++ b/src/doc/es/tutorial/conf.py @@ -13,7 +13,7 @@ import sys import os -from sage.docs.conf.conf import * +from sage.docs.conf import * # General information about the project. project = u"Sage Tutorial" diff --git a/src/doc/fr/a_tour_of_sage/conf.py b/src/doc/fr/a_tour_of_sage/conf.py index 5a5c76c713b..8a681fec1c9 100644 --- a/src/doc/fr/a_tour_of_sage/conf.py +++ b/src/doc/fr/a_tour_of_sage/conf.py @@ -12,7 +12,7 @@ # serve to show the default. import sys, os -from sage.docs.conf.conf import * +from sage.docs.conf import * # General information about the project. project = u'Sage en quelques mots' diff --git a/src/doc/fr/tutorial/conf.py b/src/doc/fr/tutorial/conf.py index 6ccbde2dd39..1a57a0add3a 100644 --- a/src/doc/fr/tutorial/conf.py +++ b/src/doc/fr/tutorial/conf.py @@ -12,7 +12,7 @@ # serve to show the default. import sys, os -from sage.docs.conf.conf import * +from sage.docs.conf import * # General information about the project. project = u"Tutoriel Sage" diff --git a/src/doc/hu/a_tour_of_sage/conf.py b/src/doc/hu/a_tour_of_sage/conf.py index b215b5f08aa..c712b84e2eb 100644 --- a/src/doc/hu/a_tour_of_sage/conf.py +++ b/src/doc/hu/a_tour_of_sage/conf.py @@ -14,7 +14,7 @@ # out serve to show the default. import sys, os -from sage.docs.conf.conf import * +from sage.docs.conf import * # General information about the project. project = u'A Sage bemutatása' diff --git a/src/doc/it/a_tour_of_sage/conf.py b/src/doc/it/a_tour_of_sage/conf.py index adc479ead2c..467c0b33a10 100644 --- a/src/doc/it/a_tour_of_sage/conf.py +++ b/src/doc/it/a_tour_of_sage/conf.py @@ -12,7 +12,7 @@ # serve to show the default. import sys, os -from sage.docs.conf.conf import * +from sage.docs.conf import * # General information about the project. project = u'Esplora Sage' diff --git a/src/doc/ja/a_tour_of_sage/conf.py b/src/doc/ja/a_tour_of_sage/conf.py index ef987b70da3..d88d0b8fd93 100644 --- a/src/doc/ja/a_tour_of_sage/conf.py +++ b/src/doc/ja/a_tour_of_sage/conf.py @@ -12,7 +12,7 @@ # serve to show the default. import sys, os -from sage.docs.conf.conf import * +from sage.docs.conf import * # General information about the project. project = u"Sage ガイドツアー" diff --git a/src/doc/ja/tutorial/conf.py b/src/doc/ja/tutorial/conf.py index 67e5e2944b0..692f6a955bc 100644 --- a/src/doc/ja/tutorial/conf.py +++ b/src/doc/ja/tutorial/conf.py @@ -12,7 +12,7 @@ # serve to show the default. import sys, os -from sage.docs.conf.conf import * +from sage.docs.conf import * # General information about the project. project = u"Sage チュートリアル" diff --git a/src/doc/pt/a_tour_of_sage/conf.py b/src/doc/pt/a_tour_of_sage/conf.py index 4b95c808e84..cd7b859907b 100644 --- a/src/doc/pt/a_tour_of_sage/conf.py +++ b/src/doc/pt/a_tour_of_sage/conf.py @@ -12,7 +12,7 @@ # serve to show the default. import sys, os -from sage.docs.conf.conf import * +from sage.docs.conf import * # General information about the project. project = u'Uma Turnê pelo Sage' diff --git a/src/doc/pt/tutorial/conf.py b/src/doc/pt/tutorial/conf.py index 3cc199e1137..9e0348e1d7b 100644 --- a/src/doc/pt/tutorial/conf.py +++ b/src/doc/pt/tutorial/conf.py @@ -12,7 +12,7 @@ # serve to show the default. import sys, os -from sage.docs.conf.conf import * +from sage.docs.conf import * # General information about the project. project = u"Tutorial Sage" diff --git a/src/doc/ru/tutorial/conf.py b/src/doc/ru/tutorial/conf.py index f677e0df3ec..247519464e3 100644 --- a/src/doc/ru/tutorial/conf.py +++ b/src/doc/ru/tutorial/conf.py @@ -12,7 +12,7 @@ # serve to show the default. import sys, os -from sage.docs.conf.conf import * +from sage.docs.conf import * # General information about the project. project = u"Sage Tutorial in Russian" diff --git a/src/doc/tr/a_tour_of_sage/conf.py b/src/doc/tr/a_tour_of_sage/conf.py index 6e9d2f38b44..960ed9932e2 100644 --- a/src/doc/tr/a_tour_of_sage/conf.py +++ b/src/doc/tr/a_tour_of_sage/conf.py @@ -12,7 +12,7 @@ # serve to show the default. import sys, os -from sage.docs.conf.conf import * +from sage.docs.conf import * # General information about the project. project = u'Sage Turu' diff --git a/src/sage/docs/conf/conf.py b/src/sage/docs/conf.py similarity index 100% rename from src/sage/docs/conf/conf.py rename to src/sage/docs/conf.py diff --git a/src/sage/docs/conf/__init__.py b/src/sage/docs/conf/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/sage/misc/sphinxify.py b/src/sage/misc/sphinxify.py index 51d5fb0b47b..4545659b19c 100644 --- a/src/sage/misc/sphinxify.py +++ b/src/sage/misc/sphinxify.py @@ -85,7 +85,7 @@ def sphinxify(docstring, format='html'): os.makedirs(confdir) with open(os.path.join(confdir, 'conf.py'), 'w') as filed: filed.write(r""" -from sage.docs.conf.conf import * +from sage.docs.conf import * extensions = ['sphinx.ext.autodoc', 'sphinx.ext.mathjax', 'sphinx.ext.todo', 'sphinx.ext.extlinks'] templates_path = ['templates'] diff --git a/src/sage_setup/docbuild/__init__.py b/src/sage_setup/docbuild/__init__.py index c650f6b2651..e406bca200b 100644 --- a/src/sage_setup/docbuild/__init__.py +++ b/src/sage_setup/docbuild/__init__.py @@ -1175,7 +1175,7 @@ def __init__(self, path): import sys, os sys.path.append({!r}) -from sage.docs.conf.conf import * +from sage.docs.conf import * project = u'Documentation for {}' release = 'unknown' name = {!r} From 2f528be198c8362e06a0f9b7cf547913ceb860c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20R=C3=BCth?= Date: Tue, 16 Jul 2019 09:50:36 +0200 Subject: [PATCH 08/10] Revert lcalc changes that made it on this branch unintentionally. --- build/pkgs/lcalc/patches/pari-mem.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/pkgs/lcalc/patches/pari-mem.patch b/build/pkgs/lcalc/patches/pari-mem.patch index fedd3dea59e..1566681a909 100644 --- a/build/pkgs/lcalc/patches/pari-mem.patch +++ b/build/pkgs/lcalc/patches/pari-mem.patch @@ -5,9 +5,9 @@ with the 16MB in this patch See https://trac.sagemath.org/ticket/24516 -diff -ru lcalc-1.23/src/Lcommandline.cc lcalc-1.23-patched/src/Lcommandline.cc +diff -ru lcalc-1.23/src/Lcommandline.cc lcalc-1.23-patched//src/Lcommandline.cc --- lcalc-1.23/src/Lcommandline.cc 2012-08-08 23:21:56.000000000 +0200 -+++ lcalc-1.23-patched/src/Lcommandline.cc 2018-01-30 11:23:06.975418539 +0100 ++++ lcalc-1.23-patched//src/Lcommandline.cc 2018-01-30 11:23:06.975418539 +0100 @@ -412,12 +412,7 @@ t2=.5; //t2=.5 because of the GAMMA(s+1/2) From 5eec95a03774ea9f2b8e5f4075554f9a3e1a0a05 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 16 Jul 2019 09:34:00 -0500 Subject: [PATCH 09/10] Fix some pyflakes issues --- src/doc/ca/intro/conf.py | 4 ++-- src/doc/de/a_tour_of_sage/conf.py | 4 ++-- src/doc/de/thematische_anleitungen/conf.py | 4 ++-- src/doc/de/tutorial/conf.py | 4 ++-- src/doc/en/a_tour_of_sage/conf.py | 4 ++-- src/doc/en/constructions/conf.py | 4 ++-- src/doc/en/developer/conf.py | 4 ++-- src/doc/en/installation/conf.py | 4 ++-- src/doc/en/prep/conf.py | 4 ++-- .../explicit_methods_in_number_theory/conf.py | 4 ++-- src/doc/en/thematic_tutorials/numerical_sage/conf.py | 4 ++-- src/doc/en/tutorial/conf.py | 4 ++-- src/doc/en/website/conf.py | 4 ++-- src/doc/fr/a_tour_of_sage/conf.py | 4 ++-- src/doc/fr/tutorial/conf.py | 4 ++-- src/doc/hu/a_tour_of_sage/conf.py | 4 ++-- src/doc/it/a_tour_of_sage/conf.py | 4 ++-- src/doc/ja/a_tour_of_sage/conf.py | 4 ++-- src/doc/ja/tutorial/conf.py | 4 ++-- src/doc/pt/a_tour_of_sage/conf.py | 4 ++-- src/doc/pt/tutorial/conf.py | 4 ++-- src/doc/ru/tutorial/conf.py | 4 ++-- src/doc/tr/a_tour_of_sage/conf.py | 4 ++-- 23 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/doc/ca/intro/conf.py b/src/doc/ca/intro/conf.py index 8af3ab5f0df..3fdd49371d6 100644 --- a/src/doc/ca/intro/conf.py +++ b/src/doc/ca/intro/conf.py @@ -11,8 +11,8 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os -from sage.docs.conf import * +from sage.docs.conf import release +from sage.docs.conf import * # NOQA # General information about the project. project = u"Introducció de Sage" diff --git a/src/doc/de/a_tour_of_sage/conf.py b/src/doc/de/a_tour_of_sage/conf.py index a1bfabb1627..bdca50bd007 100644 --- a/src/doc/de/a_tour_of_sage/conf.py +++ b/src/doc/de/a_tour_of_sage/conf.py @@ -13,8 +13,8 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os -from sage.docs.conf import * +from sage.docs.conf import release +from sage.docs.conf import * # NOQA # General information about the project. project = u"Ein Rundgang durch Sage" diff --git a/src/doc/de/thematische_anleitungen/conf.py b/src/doc/de/thematische_anleitungen/conf.py index 982ec36a99d..3c6dc419e6b 100644 --- a/src/doc/de/thematische_anleitungen/conf.py +++ b/src/doc/de/thematische_anleitungen/conf.py @@ -11,8 +11,8 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os -from sage.docs.conf import * +from sage.docs.conf import release +from sage.docs.conf import * # NOQA # General information about the project. project = u"Thematische Anleitungen" diff --git a/src/doc/de/tutorial/conf.py b/src/doc/de/tutorial/conf.py index 24576da4c08..29406ffa724 100644 --- a/src/doc/de/tutorial/conf.py +++ b/src/doc/de/tutorial/conf.py @@ -11,8 +11,8 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os -from sage.docs.conf import * +from sage.docs.conf import release +from sage.docs.conf import * # NOQA # General information about the project. project = u"Sage Tutorial" diff --git a/src/doc/en/a_tour_of_sage/conf.py b/src/doc/en/a_tour_of_sage/conf.py index a0a46bffde8..35433c65c74 100644 --- a/src/doc/en/a_tour_of_sage/conf.py +++ b/src/doc/en/a_tour_of_sage/conf.py @@ -11,8 +11,8 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os -from sage.docs.conf import * +from sage.docs.conf import release +from sage.docs.conf import * # NOQA # General information about the project. project = u'A Tour of Sage' diff --git a/src/doc/en/constructions/conf.py b/src/doc/en/constructions/conf.py index 250aced402a..1b7077d0257 100644 --- a/src/doc/en/constructions/conf.py +++ b/src/doc/en/constructions/conf.py @@ -11,8 +11,8 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os -from sage.docs.conf import * +from sage.docs.conf import release +from sage.docs.conf import * # NOQA # General information about the project. project = u"Sage Constructions" diff --git a/src/doc/en/developer/conf.py b/src/doc/en/developer/conf.py index b5fb77be5a3..d0ad3c829a9 100644 --- a/src/doc/en/developer/conf.py +++ b/src/doc/en/developer/conf.py @@ -11,8 +11,8 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os -from sage.docs.conf import * +from sage.docs.conf import release +from sage.docs.conf import * # NOQA # General information about the project. project = u"Sage Developer's Guide" diff --git a/src/doc/en/installation/conf.py b/src/doc/en/installation/conf.py index f4adce8ad26..3720af6af88 100644 --- a/src/doc/en/installation/conf.py +++ b/src/doc/en/installation/conf.py @@ -11,8 +11,8 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os -from sage.docs.conf import * +from sage.docs.conf import release +from sage.docs.conf import * # NOQA # General information about the project. project = u"Sage Installation Guide" diff --git a/src/doc/en/prep/conf.py b/src/doc/en/prep/conf.py index 5b3d2171a0b..55dfb3f41a5 100644 --- a/src/doc/en/prep/conf.py +++ b/src/doc/en/prep/conf.py @@ -11,8 +11,8 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os -from sage.docs.conf import * +from sage.docs.conf import release +from sage.docs.conf import * # NOQA # General information about the project. diff --git a/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/conf.py b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/conf.py index 0a6359ffe90..1a0b3ff863e 100644 --- a/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/conf.py +++ b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/conf.py @@ -11,8 +11,8 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os -from sage.docs.conf import * +from sage.docs.conf import release +from sage.docs.conf import * # NOQA # General information about the project. name = 'bordeaux_2008' diff --git a/src/doc/en/thematic_tutorials/numerical_sage/conf.py b/src/doc/en/thematic_tutorials/numerical_sage/conf.py index af0cec3211c..fc3354a1193 100644 --- a/src/doc/en/thematic_tutorials/numerical_sage/conf.py +++ b/src/doc/en/thematic_tutorials/numerical_sage/conf.py @@ -11,8 +11,8 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os -from sage.docs.conf import * +from sage.docs.conf import release +from sage.docs.conf import * # NOQA # General information about the project. project = u'Numerical Computing with Sage' diff --git a/src/doc/en/tutorial/conf.py b/src/doc/en/tutorial/conf.py index bdd2656bf8f..9132b04646f 100644 --- a/src/doc/en/tutorial/conf.py +++ b/src/doc/en/tutorial/conf.py @@ -11,8 +11,8 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os -from sage.docs.conf import * +from sage.docs.conf import release +from sage.docs.conf import * # NOQA # General information about the project. project = u"Sage Tutorial" diff --git a/src/doc/en/website/conf.py b/src/doc/en/website/conf.py index df1981659f9..30bf84a3fca 100644 --- a/src/doc/en/website/conf.py +++ b/src/doc/en/website/conf.py @@ -11,8 +11,8 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os -from sage.docs.conf import * +from sage.docs.conf import release +from sage.docs.conf import * # NOQA # General information about the project. project = u'Sage Documentation' diff --git a/src/doc/fr/a_tour_of_sage/conf.py b/src/doc/fr/a_tour_of_sage/conf.py index 8a681fec1c9..2cee5966a53 100644 --- a/src/doc/fr/a_tour_of_sage/conf.py +++ b/src/doc/fr/a_tour_of_sage/conf.py @@ -11,8 +11,8 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os -from sage.docs.conf import * +from sage.docs.conf import release +from sage.docs.conf import * # NOQA # General information about the project. project = u'Sage en quelques mots' diff --git a/src/doc/fr/tutorial/conf.py b/src/doc/fr/tutorial/conf.py index 1a57a0add3a..cf7e55d32fb 100644 --- a/src/doc/fr/tutorial/conf.py +++ b/src/doc/fr/tutorial/conf.py @@ -11,8 +11,8 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os -from sage.docs.conf import * +from sage.docs.conf import release +from sage.docs.conf import * # NOQA # General information about the project. project = u"Tutoriel Sage" diff --git a/src/doc/hu/a_tour_of_sage/conf.py b/src/doc/hu/a_tour_of_sage/conf.py index c712b84e2eb..b23235e2191 100644 --- a/src/doc/hu/a_tour_of_sage/conf.py +++ b/src/doc/hu/a_tour_of_sage/conf.py @@ -13,8 +13,8 @@ # All configuration values have a default; values that are commented # out serve to show the default. -import sys, os -from sage.docs.conf import * +from sage.docs.conf import release +from sage.docs.conf import * # NOQA # General information about the project. project = u'A Sage bemutatása' diff --git a/src/doc/it/a_tour_of_sage/conf.py b/src/doc/it/a_tour_of_sage/conf.py index 467c0b33a10..cb863839fe5 100644 --- a/src/doc/it/a_tour_of_sage/conf.py +++ b/src/doc/it/a_tour_of_sage/conf.py @@ -11,8 +11,8 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os -from sage.docs.conf import * +from sage.docs.conf import release +from sage.docs.conf import * # NOQA # General information about the project. project = u'Esplora Sage' diff --git a/src/doc/ja/a_tour_of_sage/conf.py b/src/doc/ja/a_tour_of_sage/conf.py index d88d0b8fd93..fee3434cd0a 100644 --- a/src/doc/ja/a_tour_of_sage/conf.py +++ b/src/doc/ja/a_tour_of_sage/conf.py @@ -11,8 +11,8 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os -from sage.docs.conf import * +from sage.docs.conf import release +from sage.docs.conf import * # NOQA # General information about the project. project = u"Sage ガイドツアー" diff --git a/src/doc/ja/tutorial/conf.py b/src/doc/ja/tutorial/conf.py index 692f6a955bc..fb456f696a2 100644 --- a/src/doc/ja/tutorial/conf.py +++ b/src/doc/ja/tutorial/conf.py @@ -11,8 +11,8 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os -from sage.docs.conf import * +from sage.docs.conf import release +from sage.docs.conf import * # NOQA # General information about the project. project = u"Sage チュートリアル" diff --git a/src/doc/pt/a_tour_of_sage/conf.py b/src/doc/pt/a_tour_of_sage/conf.py index cd7b859907b..3fcd7345228 100644 --- a/src/doc/pt/a_tour_of_sage/conf.py +++ b/src/doc/pt/a_tour_of_sage/conf.py @@ -11,8 +11,8 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os -from sage.docs.conf import * +from sage.docs.conf import release +from sage.docs.conf import * # NOQA # General information about the project. project = u'Uma Turnê pelo Sage' diff --git a/src/doc/pt/tutorial/conf.py b/src/doc/pt/tutorial/conf.py index 9e0348e1d7b..ea57824623e 100644 --- a/src/doc/pt/tutorial/conf.py +++ b/src/doc/pt/tutorial/conf.py @@ -11,8 +11,8 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os -from sage.docs.conf import * +from sage.docs.conf import release +from sage.docs.conf import * # NOQA # General information about the project. project = u"Tutorial Sage" diff --git a/src/doc/ru/tutorial/conf.py b/src/doc/ru/tutorial/conf.py index 247519464e3..3be23d01166 100644 --- a/src/doc/ru/tutorial/conf.py +++ b/src/doc/ru/tutorial/conf.py @@ -11,8 +11,8 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os -from sage.docs.conf import * +from sage.docs.conf import release +from sage.docs.conf import * # NOQA # General information about the project. project = u"Sage Tutorial in Russian" diff --git a/src/doc/tr/a_tour_of_sage/conf.py b/src/doc/tr/a_tour_of_sage/conf.py index 960ed9932e2..b9f2d99d630 100644 --- a/src/doc/tr/a_tour_of_sage/conf.py +++ b/src/doc/tr/a_tour_of_sage/conf.py @@ -11,8 +11,8 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os -from sage.docs.conf import * +from sage.docs.conf import release +from sage.docs.conf import * # NOQA # General information about the project. project = u'Sage Turu' From a401a171fcfde7ed5e5a128bb6af0967e96b11a8 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 16 Jul 2019 11:00:24 -0500 Subject: [PATCH 10/10] More pyflakes fixes --- src/doc/en/faq/conf.py | 4 +--- src/doc/en/reference/conf.py | 3 ++- src/doc/en/reference/conf_sub.py | 3 ++- src/doc/en/thematic_tutorials/conf.py | 3 +-- src/doc/es/a_tour_of_sage/conf.py | 3 +-- src/doc/es/tutorial/conf.py | 3 +-- src/doc/fr/a_tour_of_sage/conf.py | 2 +- src/doc/fr/tutorial/conf.py | 2 +- src/doc/it/a_tour_of_sage/conf.py | 2 +- src/doc/ja/a_tour_of_sage/conf.py | 2 +- src/doc/ja/tutorial/conf.py | 2 +- 11 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/doc/en/faq/conf.py b/src/doc/en/faq/conf.py index a5d6746375f..a8325a6985d 100644 --- a/src/doc/en/faq/conf.py +++ b/src/doc/en/faq/conf.py @@ -13,9 +13,7 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import os -import sys - +from sage.docs.conf import release from sage.docs.conf import * # General information about the project. diff --git a/src/doc/en/reference/conf.py b/src/doc/en/reference/conf.py index 136d5f7661c..f6a5c4490dc 100644 --- a/src/doc/en/reference/conf.py +++ b/src/doc/en/reference/conf.py @@ -11,8 +11,9 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os +import os from sage.env import SAGE_DOC_SRC, SAGE_DOC +from sage.docs.conf import release, latex_elements, exclude_patterns from sage.docs.conf import * ref_src = os.path.join(SAGE_DOC_SRC, 'en', 'reference') diff --git a/src/doc/en/reference/conf_sub.py b/src/doc/en/reference/conf_sub.py index d126f8758ac..df6d9e7be91 100644 --- a/src/doc/en/reference/conf_sub.py +++ b/src/doc/en/reference/conf_sub.py @@ -11,8 +11,9 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os +import os from sage.env import SAGE_DOC_SRC, SAGE_DOC +from sage.docs.conf import release, exclude_patterns from sage.docs.conf import * from six.moves import range diff --git a/src/doc/en/thematic_tutorials/conf.py b/src/doc/en/thematic_tutorials/conf.py index 32ae7692d25..faa096719bf 100644 --- a/src/doc/en/thematic_tutorials/conf.py +++ b/src/doc/en/thematic_tutorials/conf.py @@ -13,8 +13,7 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import os -import sys +from sage.docs.conf import release from sage.docs.conf import * # General information about the project. diff --git a/src/doc/es/a_tour_of_sage/conf.py b/src/doc/es/a_tour_of_sage/conf.py index 9bc13c66501..19fe08ea041 100644 --- a/src/doc/es/a_tour_of_sage/conf.py +++ b/src/doc/es/a_tour_of_sage/conf.py @@ -13,8 +13,7 @@ # All configuration values have a default; values that are commented # out serve to show the default. -import sys -import os +from sage.docs.conf import release from sage.docs.conf import * # General information about the project. diff --git a/src/doc/es/tutorial/conf.py b/src/doc/es/tutorial/conf.py index 0a9616b4c3d..f076c8c77f0 100644 --- a/src/doc/es/tutorial/conf.py +++ b/src/doc/es/tutorial/conf.py @@ -11,8 +11,7 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys -import os +from sage.docs.conf import release from sage.docs.conf import * # General information about the project. diff --git a/src/doc/fr/a_tour_of_sage/conf.py b/src/doc/fr/a_tour_of_sage/conf.py index 2cee5966a53..2a1ef0c9061 100644 --- a/src/doc/fr/a_tour_of_sage/conf.py +++ b/src/doc/fr/a_tour_of_sage/conf.py @@ -11,7 +11,7 @@ # All configuration values have a default; values that are commented out # serve to show the default. -from sage.docs.conf import release +from sage.docs.conf import release, latex_elements from sage.docs.conf import * # NOQA # General information about the project. diff --git a/src/doc/fr/tutorial/conf.py b/src/doc/fr/tutorial/conf.py index cf7e55d32fb..93c1b498e6c 100644 --- a/src/doc/fr/tutorial/conf.py +++ b/src/doc/fr/tutorial/conf.py @@ -11,7 +11,7 @@ # All configuration values have a default; values that are commented out # serve to show the default. -from sage.docs.conf import release +from sage.docs.conf import release, latex_elements from sage.docs.conf import * # NOQA # General information about the project. diff --git a/src/doc/it/a_tour_of_sage/conf.py b/src/doc/it/a_tour_of_sage/conf.py index cb863839fe5..69a8250fdb1 100644 --- a/src/doc/it/a_tour_of_sage/conf.py +++ b/src/doc/it/a_tour_of_sage/conf.py @@ -11,7 +11,7 @@ # All configuration values have a default; values that are commented out # serve to show the default. -from sage.docs.conf import release +from sage.docs.conf import release, latex_elements from sage.docs.conf import * # NOQA # General information about the project. diff --git a/src/doc/ja/a_tour_of_sage/conf.py b/src/doc/ja/a_tour_of_sage/conf.py index fee3434cd0a..8a1b8f53a4c 100644 --- a/src/doc/ja/a_tour_of_sage/conf.py +++ b/src/doc/ja/a_tour_of_sage/conf.py @@ -11,7 +11,7 @@ # All configuration values have a default; values that are commented out # serve to show the default. -from sage.docs.conf import release +from sage.docs.conf import release, latex_elements from sage.docs.conf import * # NOQA # General information about the project. diff --git a/src/doc/ja/tutorial/conf.py b/src/doc/ja/tutorial/conf.py index fb456f696a2..69f4b9a2c34 100644 --- a/src/doc/ja/tutorial/conf.py +++ b/src/doc/ja/tutorial/conf.py @@ -11,7 +11,7 @@ # All configuration values have a default; values that are commented out # serve to show the default. -from sage.docs.conf import release +from sage.docs.conf import release, latex_elements from sage.docs.conf import * # NOQA # General information about the project.