[arch-commits] Commit in sagemath-doc/trunk (PKGBUILD sagemath-doc-sphinx-1.8.patch)
Date: Thursday, June 27, 2019 @ 06:31:11
Author: arojas
Revision: 484666
Update to 8.8
Modified:
sagemath-doc/trunk/PKGBUILD
Deleted:
sagemath-doc/trunk/sagemath-doc-sphinx-1.8.patch
---+
PKGBUILD | 24 +-
sagemath-doc-sphinx-1.8.patch | 332
2 files changed, 10 insertions(+), 346 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-06-27 06:00:38 UTC (rev 484665)
+++ PKGBUILD2019-06-27 06:31:11 UTC (rev 484666)
@@ -1,7 +1,7 @@
# Maintainer: Antonio Rojas
pkgname=sagemath-doc
-pkgver=8.7
+pkgver=8.8
pkgrel=1
pkgdesc="HTML documentation and inline help for SageMath"
arch=(any)
@@ -11,12 +11,10 @@
makedepends=(sagemath python2-pyzmq python2-docutils python2-jupyter_client
python2-pkgconfig cython2 python2-ipywidgets)
source=(sagemath-$pkgver.tar.gz::"https://github.com/sagemath/sage/archive/$pkgver.tar.gz;
docbuild_main.patch
-sagemath-doc-sphinx-1.8.patch
sagemath-doc-segfault.patch
sagemath-ecl-sigfpe.patch)
-sha256sums=('263c3b3fc956b8bebc532f3b51e68c1b0d559d3b7e7c9fadffdfc0f4dbae18ab'
+sha256sums=('d012ff4f0f34e086fcaf576e25220fc647826116c69b62b887bc0b8ced5c1e9f'
'ea5e17bb7a7cb36a22e5e3872fcc2585852bc971c4b139b0b2cd69a36c1b009b'
-'ec6835d555056e1f20684de015f43c46cff62a132c9cd6f5ea7243c6bacd3f1e'
'2ee218610001f906015df647881581ff1f7eb0acf923b79b72056965129bac22'
'a42f3b152b1aedb8abf16bc70971419919d1fe30328574e7fef8305f9d07d938')
@@ -28,8 +26,6 @@
# use sage_setup imports from sagemath source, but use system sage ones (which
include compiled modules)
mkdir -p local-python
ln -sr src/sage_setup local-python
-# fix build with sphinx 1.8
- patch -p1 -i ../sagemath-doc-sphinx-1.8.patch
# Fix segfault when pari is compiled with threads
https://trac.sagemath.org/ticket/26608
patch -p1 -i ../sagemath-doc-segfault.patch
# Fix SIGFPE crashes with ecl 16.1.3 https://trac.sagemath.org/ticket/22191
@@ -39,14 +35,14 @@
build() {
cd sage-$pkgver/src
- export SAGE_LOCAL="/usr"
- export SAGE_ROOT="/usr"
- export SAGE_SRC="$PWD"
- export SAGE_DOC_SRC="$SAGE_SRC"/doc
- export SAGE_DOC="$SAGE_DOC_SRC"
- export SAGE_DOC_MATHJAX=yes
- export PYTHONPATH="$srcdir"/sage-$pkgver/local-python
- export SAGE_NUM_THREADS=10
+ export SAGE_LOCAL="/usr" \
+ SAGE_ROOT="/usr" \
+ SAGE_SRC="$PWD" \
+ SAGE_DOC_SRC="$PWD"/doc \
+ SAGE_DOC="$PWD"/doc \
+ SAGE_DOC_MATHJAX=yes \
+ PYTHONPATH="$srcdir"/sage-$pkgver/local-python \
+ SAGE_NUM_THREADS=10
python2 sage_setup/docbuild --no-pdf-links all html
}
Deleted: sagemath-doc-sphinx-1.8.patch
===
--- sagemath-doc-sphinx-1.8.patch 2019-06-27 06:00:38 UTC (rev 484665)
+++ sagemath-doc-sphinx-1.8.patch 2019-06-27 06:31:11 UTC (rev 484666)
@@ -1,332 +0,0 @@
-diff --git a/src/doc/common/conf.py b/src/doc/common/conf.py
-index 70dd17f..e9a3dae 100644
a/src/doc/common/conf.py
-+++ b/src/doc/common/conf.py
-@@ -4,6 +4,8 @@ import sage.version
- from sage.misc.sagedoc import extlinks
- import dateutil.parser
- from six import iteritems
-+from docutils import nodes
-+from docutils.transforms import Transform
-
- # If your extensions are in another directory, add it here.
- sys.path.append(os.path.join(SAGE_SRC, "sage_setup", "docbuild", "ext"))
-@@ -669,7 +671,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
-adics
-+Introduction to the
p-adics
- """
- debug_inf(app, " Trying intersphinx for %s" % node['reftarget'])
- builder = app.builder
-diff --git a/src/sage/misc/sphinxify.py b/src/sage/misc/sphinxify.py
-index 6e21344..4270294 100644
a/src/sage/misc/sphinxify.py
-+++ b/src/sage/misc/sphinxify.py
-@@ -68,20 +68,20 @@ def sphinxify(docstring, format='html'):
- sage: assert n == len(sys.path)
- """
- srcdir = mkdtemp()
--base_name = os.path.join(srcdir, 'docstring')
--rst_name = base_name + '.rst'
-+outdir = mkdtemp()
-+src_base_name = os.path.join(srcdir, 'docstring')
-+out_base_name = os.path.join(outdir, 'docstring')
-+rst_name = src_base_name + '.rst'
-
- if format == 'html':
- suffix = '.html'
- else:
- suffix = '.txt'
--output_name = base_name + suffix
-+output_name = out_base_name + suffix
-
- with open(rst_name, 'w') as filed:
- filed.write(docstring)
-
--# Sphinx constructor: Sphinx(srcdir, confdir, outdir, doctreedir,
--# buildername, confoverrides, status, warning, freshenv).
- confdir =
[arch-commits] Commit in sagemath-doc/trunk (PKGBUILD sagemath-doc-sphinx-1.8.patch)
Date: Wednesday, January 30, 2019 @ 14:28:10
Author: arojas
Revision: 428641
Use upstream sphinx patch
Modified:
sagemath-doc/trunk/PKGBUILD
sagemath-doc/trunk/sagemath-doc-sphinx-1.8.patch
---+
PKGBUILD |2
sagemath-doc-sphinx-1.8.patch | 223
2 files changed, 117 insertions(+), 108 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-01-30 13:49:59 UTC (rev 428640)
+++ PKGBUILD2019-01-30 14:28:10 UTC (rev 428641)
@@ -17,7 +17,7 @@
sagemath-cypari2.patch)
sha256sums=('dea613fc955cada76aaa7ab379bc5a219fe8b496064824f8c798b2b1651442fa'
'ea5e17bb7a7cb36a22e5e3872fcc2585852bc971c4b139b0b2cd69a36c1b009b'
-'8ed0b9151d392b9e1abbc2921e98f86000d0e8d3a78994e6fd3fd4610957e8b9'
+'337d1d84749c1415c120a95d621d8cb0a4ef6e29245193c673e4b3f3a5d56fe9'
'141ac064305526785fb6d9507896876cbf893cd41ec1e42d86fc836f766c200f'
'a42f3b152b1aedb8abf16bc70971419919d1fe30328574e7fef8305f9d07d938'
'ca47248d2ed5edfe663ea02e261ddbb26a7cb03bef67928dbec690d9b9a8f129')
Modified: sagemath-doc-sphinx-1.8.patch
===
--- sagemath-doc-sphinx-1.8.patch 2019-01-30 13:49:59 UTC (rev 428640)
+++ sagemath-doc-sphinx-1.8.patch 2019-01-30 14:28:10 UTC (rev 428641)
@@ -1,56 +1,63 @@
-diff --git a/src/sage_setup/docbuild/__init__.py
b/src/sage_setup/docbuild/__init__.py
-index ff67979..83b49e1 100644
a/src/sage_setup/docbuild/__init__.py
-+++ b/src/sage_setup/docbuild/__init__.py
-@@ -332,6 +331,18 @@ class AllBuilder(object):
- for document in refs:
- getattr(get_builder(document), 'inventory')(*args, **kwds)
+diff --git a/src/sage/misc/sphinxify.py b/src/sage/misc/sphinxify.py
+index 6e21344..4270294 100644
+--- a/src/sage/misc/sphinxify.py
b/src/sage/misc/sphinxify.py
+@@ -68,20 +68,20 @@ def sphinxify(docstring, format='html'):
+ sage: assert n == len(sys.path)
+ """
+ srcdir = mkdtemp()
+-base_name = os.path.join(srcdir, 'docstring')
+-rst_name = base_name + '.rst'
++outdir = mkdtemp()
++src_base_name = os.path.join(srcdir, 'docstring')
++out_base_name = os.path.join(outdir, 'docstring')
++rst_name = src_base_name + '.rst'
-+# In the inventory build, the directory
-+# SAGE_DOC/inventory/en/reference/_static might be created,
-+# but it is unnecessary in the inventory build -- this
-+# directory should contain javascript and style files
-+# specifically for the html build -- and it can confuse
-+# intersphinx and the html builder when they look for
-+# inventory files. So delete this directory.
-+staticdir = os.path.join(SAGE_DOC, 'inventory', 'en', 'reference',
'_static')
-+if os.path.isdir(staticdir):
-+logger.info("Deleting _static directory in the inventory build")
-+shutil.rmtree(staticdir)
-+
- logger.warning("Building reference manual, second pass.\n")
- for document in refs:
- getattr(get_builder(document), name)(*args, **kwds)
-diff --git a/src/sage_setup/docbuild/ext/sage_autodoc.py
b/src/sage_setup/docbuild/ext/sage_autodoc.py
-index 2c399bad51..96abec3382 100644
a/src/sage_setup/docbuild/ext/sage_autodoc.py
-+++ b/src/sage_setup/docbuild/ext/sage_autodoc.py
-@@ -39,8 +39,9 @@ from docutils.statemachine import ViewList
- import sphinx
- from sphinx.util import rpartition, force_decode
- from sphinx.locale import _
--from sphinx.pycode import ModuleAnalyzer, PycodeError
--from sphinx.application import ExtensionError
-+from sphinx.pycode import ModuleAnalyzer
-+from sphinx.errors import ExtensionError, PycodeError
-+from sphinx.util.logging import getLogger
- from sphinx.util.nodes import nested_parse_with_titles
- from docutils.parsers.rst import Directive
- from sphinx.util.inspect import getargspec, isdescriptor, safe_getmembers, \
-diff --git a/src/sage_setup/docbuild/ext/multidocs.py
b/src/sage_setup/docbuild/ext/multidocs.py
-index dc2e065e7e..ddd28c1a46 100644
a/src/sage_setup/docbuild/ext/multidocs.py
-+++ b/src/sage_setup/docbuild/ext/multidocs.py
-@@ -302,7 +302,6 @@ def init_subdoc(app):
- os.unlink(static_dir)
- os.symlink(master_static_dir, static_dir)
-
--app.builder.copy_static_files = link_static_files
-
- if app.config.multidoc_first_pass == 1:
- app.config.intersphinx_mapping = {}
+ if format == 'html':
+ suffix = '.html'
+ else:
+ suffix = '.txt'
+-output_name = base_name + suffix
++output_name = out_base_name + suffix
+
+ with open(rst_name, 'w') as filed:
+ filed.write(docstring)
+
+-# Sphinx constructor: Sphinx(srcdir, confdir, outdir, doctreedir,
+-# buildername,
[arch-commits] Commit in sagemath-doc/trunk (PKGBUILD sagemath-doc-sphinx-1.8.patch)
Date: Sunday, September 23, 2018 @ 10:55:43
Author: arojas
Revision: 384195
Fix build with sphinx 1.8
Added:
sagemath-doc/trunk/sagemath-doc-sphinx-1.8.patch
Modified:
sagemath-doc/trunk/PKGBUILD
---+
PKGBUILD |7 +--
sagemath-doc-sphinx-1.8.patch | 16
2 files changed, 21 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-09-23 10:15:08 UTC (rev 384194)
+++ PKGBUILD2018-09-23 10:55:43 UTC (rev 384195)
@@ -10,9 +10,10 @@
depends=(python2-sphinx gap-4.8-doc thebe)
makedepends=(sage-notebook python2-pyzmq python2-docutils
python2-jupyter_client python2-pkgconfig cython2 python2-ipywidgets)
source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz;
-docbuild_main.patch)
+docbuild_main.patch sagemath-doc-sphinx-1.8.patch)
sha256sums=('41fd0b4eb820f7a1274e12294b6fbdbbf60d0027bff98c22fdc84da140964929'
-'ea5e17bb7a7cb36a22e5e3872fcc2585852bc971c4b139b0b2cd69a36c1b009b')
+'ea5e17bb7a7cb36a22e5e3872fcc2585852bc971c4b139b0b2cd69a36c1b009b'
+'f2488c508c3322ad1bdedd56913adbcb4ab964531be95d12a86abb723b9fd25e')
prepare() {
cd sage-$pkgver
@@ -22,6 +23,8 @@
# use sage_setup imports from sagemath source, but use system sage ones (which
include compiled modules)
mkdir -p local-python
ln -sr src/sage_setup local-python
+# fix build with sphinx 1.8
+ patch -p1 -i ../sagemath-doc-sphinx-1.8.patch
}
build() {
Added: sagemath-doc-sphinx-1.8.patch
===
--- sagemath-doc-sphinx-1.8.patch (rev 0)
+++ sagemath-doc-sphinx-1.8.patch 2018-09-23 10:55:43 UTC (rev 384195)
@@ -0,0 +1,16 @@
+diff --git a/src/sage_setup/docbuild/ext/sage_autodoc.py
b/src/sage_setup/docbuild/ext/sage_autodoc.py
+index 2c399bad51..96abec3382 100644
+--- a/src/sage_setup/docbuild/ext/sage_autodoc.py
b/src/sage_setup/docbuild/ext/sage_autodoc.py
+@@ -39,8 +39,9 @@ from docutils.statemachine import ViewList
+ import sphinx
+ from sphinx.util import rpartition, force_decode
+ from sphinx.locale import _
+-from sphinx.pycode import ModuleAnalyzer, PycodeError
+-from sphinx.application import ExtensionError
++from sphinx.pycode import ModuleAnalyzer
++from sphinx.errors import ExtensionError, PycodeError
++from sphinx.util.logging import getLogger
+ from sphinx.util.nodes import nested_parse_with_titles
+ from docutils.parsers.rst import Directive
+ from sphinx.util.inspect import getargspec, isdescriptor, safe_getmembers, \
