Version 9.5.

Drop unnecessary -4ti2 and -primecount patches.
This commit is contained in:
Jerry James 2022-03-21 08:59:27 -06:00
parent 82b1c380fc
commit 30bb46d8dc
16 changed files with 510 additions and 622 deletions

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-08-22 02:44:34.000000000 -0600
+++ src/sage_docbuild/ext/multidocs.py 2021-08-26 13:11:24.937824557 -0600
--- 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):
for ind in newalldoc:
# treat subdocument source as orphaned file and don't complain
@ -16,15 +16,15 @@ 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-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():
--- 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():
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.hlp.gz'
+ 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,