Sync patches with stable

1 files changed, 28 insertions, 0 deletions

diff --git a/sagemath-sphinx-1.8.patch b/sagemath-sphinx-1.8.patch
new file mode 100644
index 000000000000..f54439334a0d
--- /dev/null
+++ b/sagemath-sphinx-1.8.patch
@@ -0,0 +1,28 @@
+--- a/src/sage/misc/sphinxify.py	2018-09-14 20:13:32.788831484 +0200
++++ b/src/sage/misc/sphinxify.py	2018-09-14 20:14:07.142478667 +0200
+@@ -64,6 +64,7 @@
+         sage: assert n == len(sys.path)
+     """
+     srcdir = mkdtemp()
++    outdir = mkdtemp()
+     base_name = os.path.join(srcdir, 'docstring')
+     rst_name = base_name + '.rst'
+ 
+@@ -71,7 +72,7 @@
+         suffix = '.html'
+     else:
+         suffix = '.txt'
+-    output_name = base_name + suffix
++    output_name = os.path.join(outdir, 'docstring') + suffix
+ 
+     with open(rst_name, 'w') as filed:
+         filed.write(docstring)
+@@ -89,7 +90,7 @@
+ 
+     import sys
+     old_sys_path = list(sys.path)  # Sphinx modifies sys.path
+-    sphinx_app = Sphinx(srcdir, confdir, srcdir, doctreedir, format,
++    sphinx_app = Sphinx(srcdir, confdir, outdir, doctreedir, format,
+                         confoverrides, None, None, True)
+     sphinx_app.build(None, [rst_name])
+     sys.path = old_sys_path