zyppe/sagemath
1
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/sagemath.git synced 2025-04-22 11:45:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Version 9.4.

Browse source 
- Drop upstreamed -eclib patch.
- Drop unnecessary -readonly patch.
- Unbundle ipywidgets.
- Bundle memory_allocator for now.
This commit is contained in:
Jerry James 2021-08-27 13:18:01 -06:00
parent db8b5a20c1
commit 916819fe9b
11 changed files with 390 additions and 482 deletions
Download patch file Download diff file Expand all files Collapse all files

32
sagemath-sagedoc.patch
View file

@ -1,6 +1,6 @@
diff -up src/sage_docbuild/ext/multidocs.py.orig src/sage_docbuild/ext/multidocs.py
--- src/sage_docbuild/ext/multidocs.py.orig 2021-05-09 16:00:11.000000000 -0600
+++ src/sage_docbuild/ext/multidocs.py 2021-05-28 11:32:20.056542939 -0600
--- src/sage_docbuild/ext/multidocs.py.orig 2021-08-22 02:44:34.000000000 -0600
+++ src/sage_docbuild/ext/multidocs.py 2021-08-26 13:11:24.937824557 -0600
@@ -84,8 +84,11 @@ def merge_environment(app, env):
for ind in newalldoc:
# treat subdocument source as orphaned file and don't complain
@ -16,26 +16,20 @@ 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 2021-05-09 16:00:11.000000000 -0600
+++ src/sage/interfaces/singular.py 2021-05-28 11:29:00.597523201 -0600
@@ -2365,7 +2365,7 @@ def generate_docstring_dictionary():
nodes.clear()
node_names.clear()
--- src/sage/interfaces/singular.py.orig 2021-08-26 13:11:24.940824561 -0600
+++ src/sage/interfaces/singular.py 2021-08-26 13:17:49.831262334 -0600
@@ -2370,11 +2370,11 @@ def generate_docstring_dictionary():
- singular_docdir = SINGULARPATH + "/../info/"
+ singular_docdir = "/usr/share/info/"
new_node = re.compile(r"File: singular\.hlp, Node: ([^,]*),.*")
new_lookup = re.compile(r"\* ([^:]*):*([^.]*)\..*")
@@ -2373,8 +2373,9 @@ def generate_docstring_dictionary():
L, in_node, curr_node = [], False, None
# singular.hlp contains a few iso-5559-1 encoded special characters
- with io.open(os.path.join(singular_docdir, 'singular.hlp'),
- encoding='latin-1') as f:
- from sage.libs.singular.singular import get_resource
- singular_info_file = get_resource('i')
+ singular_info_file = '/usr/share/info/singular.hlp.gz'
# singular.hlp contains a few iso-8859-1 encoded special characters
- with io.open(singular_info_file,
+ import gzip
+ with gzip.open(os.path.join(singular_docdir, 'singular.hlp.gz'),
+ encoding='utf-8') as f:
+ with gzip.open(singular_info_file,
encoding='latin-1') as f:
for line in f:
m = re.match(new_node,line)
if m: