Version 9.6

- Fix path to libSingular.so (bz 2073208)
- Fix threejs install location (bz 2081720)
- Drop upstreamed -rubiks and -intersphinx-disabled-reftypes patches
- Drop no longer used ratpoints BR
- Thebe is no longer bundled
This commit is contained in:
Jerry James 2022-06-07 09:24:36 -06:00
parent 33af71616a
commit aed4db5045
10 changed files with 300 additions and 646 deletions

View file

@ -1,7 +1,7 @@
diff -up src/sage_docbuild/ext/multidocs.py.orig src/sage_docbuild/ext/multidocs.py
--- src/sage_docbuild/ext/multidocs.py.orig 2022-01-30 06:41:50.000000000 -0700
+++ src/sage_docbuild/ext/multidocs.py 2022-03-04 16:08:42.795455456 -0700
@@ -84,8 +84,11 @@ def merge_environment(app, env):
--- src/sage_docbuild/ext/multidocs.py.orig 2022-05-15 16:11:11.000000000 -0600
+++ src/sage_docbuild/ext/multidocs.py 2022-06-01 10:51:11.630814539 -0600
@@ -83,8 +83,11 @@ def merge_environment(app, env):
for ind in newalldoc:
# treat subdocument source as orphaned file and don't complain
md = env.metadata.get(ind, dict())
@ -16,9 +16,9 @@ diff -up src/sage_docbuild/ext/multidocs.py.orig src/sage_docbuild/ext/multidocs
newcite = {}
for ind, (path, tag, lineno) in citations.items():
diff -up src/sage/interfaces/singular.py.orig src/sage/interfaces/singular.py
--- src/sage/interfaces/singular.py.orig 2022-01-30 06:41:50.000000000 -0700
+++ src/sage/interfaces/singular.py 2022-03-04 16:09:20.555418442 -0700
@@ -2330,11 +2330,11 @@ def generate_docstring_dictionary():
--- src/sage/interfaces/singular.py.orig 2022-05-15 16:11:11.000000000 -0600
+++ src/sage/interfaces/singular.py 2022-06-01 10:51:11.630814539 -0600
@@ -2327,11 +2327,11 @@ def generate_docstring_dictionary():
L, in_node, curr_node = [], False, None
@ -32,4 +32,4 @@ diff -up src/sage/interfaces/singular.py.orig src/sage/interfaces/singular.py
+ with gzip.open(singular_info_file,
encoding='latin-1') as f:
for line in f:
m = re.match(new_node,line)
m = re.match(new_node, line)