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

Version 9.7

Browse source 
Drop upstreamed patches: -infinite-recursion, -use-after-free, -sphinx
This commit is contained in:
Jerry James 2023-01-17 08:43:14 -07:00
parent fed038c815
commit bf7a318833
17 changed files with 532 additions and 1033 deletions
Download patch file Download diff file Expand all files Collapse all files

49
sagemath-python3.11.patch
View file

@ -1,6 +1,6 @@
diff -up src/sage/cpython/cython_metaclass.h.orig src/sage/cpython/cython_metaclass.h
--- src/sage/cpython/cython_metaclass.h.orig 2022-05-15 16:11:11.000000000 -0600
+++ src/sage/cpython/cython_metaclass.h 2022-06-29 11:07:37.296150769 -0600
--- src/sage/cpython/cython_metaclass.h.orig 2022-09-19 16:38:18.000000000 -0600
+++ src/sage/cpython/cython_metaclass.h 2023-01-15 19:52:42.818659170 -0700
@@ -66,7 +66,7 @@ static CYTHON_INLINE int Sage_PyType_Rea
}
@ -11,8 +11,8 @@ diff -up src/sage/cpython/cython_metaclass.h.orig src/sage/cpython/cython_metacl
}
else
diff -up src/sage/cpython/dict_del_by_value.pyx.orig src/sage/cpython/dict_del_by_value.pyx
--- src/sage/cpython/dict_del_by_value.pyx.orig 2022-05-15 16:11:11.000000000 -0600
+++ src/sage/cpython/dict_del_by_value.pyx 2022-06-30 12:06:01.148346330 -0600
--- src/sage/cpython/dict_del_by_value.pyx.orig 2022-09-19 16:38:18.000000000 -0600
+++ src/sage/cpython/dict_del_by_value.pyx 2023-01-15 19:52:42.819659153 -0700
@@ -25,7 +25,7 @@ from weakref import KeyedRef
from cpython.list cimport PyList_New
from cpython cimport Py_XINCREF, Py_XDECREF
@ -250,8 +250,8 @@ diff -up src/sage/cpython/dict_del_by_value.pyx.orig src/sage/cpython/dict_del_b
def test_del_dictitem_by_exact_value(D, value, h):
"""
diff -up src/sage/libs/gmp/pylong.pyx.orig src/sage/libs/gmp/pylong.pyx
--- src/sage/libs/gmp/pylong.pyx.orig 2022-05-15 16:11:11.000000000 -0600
+++ src/sage/libs/gmp/pylong.pyx 2022-06-29 12:44:27.983218616 -0600
--- src/sage/libs/gmp/pylong.pyx.orig 2022-09-19 16:38:18.000000000 -0600
+++ src/sage/libs/gmp/pylong.pyx 2023-01-15 19:52:42.819659153 -0700
@@ -33,6 +33,7 @@ from .mpz cimport *
cdef extern from *:
@ -274,8 +274,8 @@ diff -up src/sage/libs/gmp/pylong.pyx.orig src/sage/libs/gmp/pylong.pyx
diff -up src/sage/misc/decorators.py.orig src/sage/misc/decorators.py
--- src/sage/misc/decorators.py.orig 2022-05-15 16:11:11.000000000 -0600
+++ src/sage/misc/decorators.py 2022-06-29 14:02:56.995436952 -0600
--- src/sage/misc/decorators.py.orig 2022-09-19 16:38:19.000000000 -0600
+++ src/sage/misc/decorators.py 2023-01-15 19:52:42.819659153 -0700
@@ -31,8 +31,7 @@ from functools import (partial, update_w
from copy import copy
@ -287,17 +287,16 @@ diff -up src/sage/misc/decorators.py.orig src/sage/misc/decorators.py
def sage_wraps(wrapped, assigned=WRAPPER_ASSIGNMENTS, updated=WRAPPER_UPDATES):
diff -up src/sage/misc/sageinspect.py.orig src/sage/misc/sageinspect.py
--- src/sage/misc/sageinspect.py.orig 2022-05-15 16:11:11.000000000 -0600
+++ src/sage/misc/sageinspect.py 2022-06-29 14:07:56.804147321 -0600
@@ -119,6 +119,7 @@ import functools
--- src/sage/misc/sageinspect.py.orig 2023-01-15 17:07:04.838843913 -0700
+++ src/sage/misc/sageinspect.py 2023-01-15 19:53:47.194510597 -0700
@@ -119,12 +119,15 @@ import functools
import os
import tokenize
import re
+from collections import namedtuple
from sage.env import SAGE_LIB
try:
@@ -126,6 +127,8 @@ try:
import importlib.machinery as import_machinery
except ImportError:
pass
@ -306,7 +305,7 @@ diff -up src/sage/misc/sageinspect.py.orig src/sage/misc/sageinspect.py
def is_function_or_cython_function(obj):
"""
@@ -348,7 +351,7 @@ def _extract_embedded_signature(docstrin
@@ -359,7 +362,7 @@ def _extract_embedded_signature(docstrin
docstring = L[1] if len(L) > 1 else '' # Remove first line, keep the rest
def_string = "def " + name + signature + ": pass"
try:
@ -315,7 +314,7 @@ diff -up src/sage/misc/sageinspect.py.orig src/sage/misc/sageinspect.py
except SyntaxError:
docstring = os.linesep.join(L)
return docstring, None
@@ -1092,7 +1095,7 @@ def _sage_getargspec_from_ast(source):
@@ -1100,7 +1103,7 @@ def _sage_getargspec_from_ast(source):
OUTPUT:
@ -324,7 +323,7 @@ diff -up src/sage/misc/sageinspect.py.orig src/sage/misc/sageinspect.py
EXAMPLES::
@@ -1124,8 +1127,7 @@ def _sage_getargspec_from_ast(source):
@@ -1132,8 +1135,7 @@ def _sage_getargspec_from_ast(source):
vararg = getattr(ast_args.vararg, 'arg', None)
kwarg = getattr(ast_args.kwarg, 'arg', None)
@ -334,7 +333,7 @@ diff -up src/sage/misc/sageinspect.py.orig src/sage/misc/sageinspect.py
def _sage_getargspec_cython(source):
@@ -1141,7 +1143,7 @@ def _sage_getargspec_cython(source):
@@ -1149,7 +1151,7 @@ def _sage_getargspec_cython(source):
OUTPUT:
@ -343,7 +342,7 @@ diff -up src/sage/misc/sageinspect.py.orig src/sage/misc/sageinspect.py
EXAMPLES::
@@ -1605,11 +1607,11 @@ def sage_getargspec(obj):
@@ -1659,11 +1661,11 @@ def sage_getargspec(obj):
return sage_getargspec(obj.__call__)
if isinstance(obj, (lazy_attribute, AbstractMethod)):
source = sage_getsource(obj)
@ -357,7 +356,7 @@ diff -up src/sage/misc/sageinspect.py.orig src/sage/misc/sageinspect.py
except (AttributeError, TypeError):
pass
# If we are lucky, the function signature is embedded in the docstring.
@@ -1625,7 +1627,7 @@ def sage_getargspec(obj):
@@ -1679,7 +1681,7 @@ def sage_getargspec(obj):
# Note that this may give a wrong result for the constants!
try:
args, varargs, varkw = inspect.getargs(obj.__code__)
@ -366,7 +365,7 @@ diff -up src/sage/misc/sageinspect.py.orig src/sage/misc/sageinspect.py
except (TypeError, AttributeError):
pass
if isclassinstance(obj):
@@ -1660,7 +1662,7 @@ def sage_getargspec(obj):
@@ -1714,7 +1716,7 @@ def sage_getargspec(obj):
except TypeError: # happens for Python builtins
source = ''
if source:
@ -375,7 +374,7 @@ diff -up src/sage/misc/sageinspect.py.orig src/sage/misc/sageinspect.py
else:
func_obj = obj
@@ -1673,7 +1675,7 @@ def sage_getargspec(obj):
@@ -1727,7 +1729,7 @@ def sage_getargspec(obj):
except TypeError: # arg is not a code object
# The above "hopefully" was wishful thinking:
try:
@ -384,7 +383,7 @@ diff -up src/sage/misc/sageinspect.py.orig src/sage/misc/sageinspect.py
except TypeError: # This happens for Python builtins
# The best we can do is to return a generic argspec
args = []
@@ -1683,7 +1685,7 @@ def sage_getargspec(obj):
@@ -1737,7 +1739,7 @@ def sage_getargspec(obj):
defaults = func_obj.__defaults__
except AttributeError:
defaults = None
@ -393,7 +392,7 @@ diff -up src/sage/misc/sageinspect.py.orig src/sage/misc/sageinspect.py
def formatannotation(annotation, base_module=None):
@@ -1754,19 +1756,7 @@ def sage_formatargspec(args, varargs=Non
@@ -1808,19 +1810,7 @@ def sage_formatargspec(args, varargs=Non
:func:`sage_getargspec`. Since :func:`sage_getargspec` works for
Cython functions while Python's inspect module does not, it makes
sense to keep this function for formatting instances of
@ -415,8 +414,8 @@ diff -up src/sage/misc/sageinspect.py.orig src/sage/misc/sageinspect.py
def formatargandannotation(arg):
result = formatarg(arg)
diff -up src/sage/symbolic/ginac/numeric.cpp.orig src/sage/symbolic/ginac/numeric.cpp
--- src/sage/symbolic/ginac/numeric.cpp.orig 2022-05-15 16:11:11.000000000 -0600
+++ src/sage/symbolic/ginac/numeric.cpp 2022-06-24 14:58:32.506790725 -0600
--- src/sage/symbolic/ginac/numeric.cpp.orig 2022-09-19 16:38:19.000000000 -0600
+++ src/sage/symbolic/ginac/numeric.cpp 2023-01-15 19:52:42.820659135 -0700
@@ -52,7 +52,6 @@
#define register
#define PY_SSIZE_T_CLEAN