mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-10 23:18:51 -04:00
aed4db5045
- 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
35 lines
1.6 KiB
Diff
35 lines
1.6 KiB
Diff
diff -up src/sage_docbuild/ext/multidocs.py.orig src/sage_docbuild/ext/multidocs.py
|
|
--- 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())
|
|
- md['orphan'] = 1
|
|
- env.metadata[ind] = md
|
|
+ try:
|
|
+ md['orphan'] = 1
|
|
+ env.metadata[ind] = md
|
|
+ except AttributeError:
|
|
+ env.metadata[ind] = {'orphan'}
|
|
# merge the citations
|
|
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-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
|
|
|
|
- from sage.libs.singular.singular import get_resource
|
|
- singular_info_file = get_resource('i')
|
|
+ singular_info_file = '/usr/share/info/singular.info.gz'
|
|
|
|
# singular.hlp contains a few iso-8859-1 encoded special characters
|
|
- with io.open(singular_info_file,
|
|
+ import gzip
|
|
+ with gzip.open(singular_info_file,
|
|
encoding='latin-1') as f:
|
|
for line in f:
|
|
m = re.match(new_node, line)
|