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.5.

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

183
sagemath-python3.patch
View file

@ -1,6 +1,6 @@
diff -up src/sage/cpython/debugimpl.c.orig src/sage/cpython/debugimpl.c
--- src/sage/cpython/debugimpl.c.orig 2021-05-09 16:00:11.000000000 -0600
+++ src/sage/cpython/debugimpl.c 2021-05-28 11:39:54.261578894 -0600
--- src/sage/cpython/debugimpl.c.orig 2022-01-30 06:41:50.000000000 -0700
+++ src/sage/cpython/debugimpl.c 2022-03-04 16:16:45.900676037 -0700
@@ -148,6 +148,7 @@ static void _type_debug(PyTypeObject* tp
printf(" tp_basicsize: %ld\n", (long)tp->tp_basicsize);
printf(" tp_itemsize: %ld\n", (long)tp->tp_itemsize);
@ -18,8 +18,8 @@ diff -up src/sage/cpython/debugimpl.c.orig src/sage/cpython/debugimpl.c
attr_pointer_meth(tp_call, "__call__");
attr_pointer_meth(tp_str, "__str__");
diff -up src/sage/cpython/debug.pyx.orig src/sage/cpython/debug.pyx
--- src/sage/cpython/debug.pyx.orig 2021-05-09 16:00:11.000000000 -0600
+++ src/sage/cpython/debug.pyx 2021-05-28 11:39:54.261578894 -0600
--- src/sage/cpython/debug.pyx.orig 2022-01-30 06:41:50.000000000 -0700
+++ src/sage/cpython/debug.pyx 2022-03-04 16:16:45.900676037 -0700
@@ -231,6 +231,7 @@ def type_debug(cls):
tp_basicsize: 16
tp_itemsize: 0
@ -37,9 +37,9 @@ diff -up src/sage/cpython/debug.pyx.orig src/sage/cpython/debug.pyx
tp_call (__call__): NULL
tp_str (__str__): 0x7fc57d757020
diff -up src/sage/geometry/triangulation/point_configuration.py.orig src/sage/geometry/triangulation/point_configuration.py
--- src/sage/geometry/triangulation/point_configuration.py.orig 2021-05-09 16:00:11.000000000 -0600
+++ src/sage/geometry/triangulation/point_configuration.py 2021-05-28 11:39:54.263578895 -0600
@@ -618,11 +618,11 @@ class PointConfiguration(UniqueRepresent
--- src/sage/geometry/triangulation/point_configuration.py.orig 2022-01-30 06:41:50.000000000 -0700
+++ src/sage/geometry/triangulation/point_configuration.py 2022-03-04 16:16:45.901676039 -0700
@@ -619,11 +619,11 @@ class PointConfiguration(UniqueRepresent
['{{0,1,2,4},{1,2,3,4}}']
"""
timeout = 600
@ -54,8 +54,8 @@ diff -up src/sage/geometry/triangulation/point_configuration.py.orig src/sage/ge
if verbose:
print("#### TOPCOM input ####")
diff -up src/sage/interfaces/frobby.py.orig src/sage/interfaces/frobby.py
--- src/sage/interfaces/frobby.py.orig 2021-05-09 16:00:11.000000000 -0600
+++ src/sage/interfaces/frobby.py 2021-05-28 11:39:54.264578894 -0600
--- src/sage/interfaces/frobby.py.orig 2022-01-30 06:41:50.000000000 -0700
+++ src/sage/interfaces/frobby.py 2022-03-04 16:16:45.901676039 -0700
@@ -78,7 +78,7 @@ class Frobby:
print("Frobby command: ", repr(command))
print("Frobby input:\n", input)
@ -66,8 +66,8 @@ diff -up src/sage/interfaces/frobby.py.orig src/sage/interfaces/frobby.py
frinput = str_to_bytes(input)
else:
diff -up src/sage/interfaces/gfan.py.orig src/sage/interfaces/gfan.py
--- src/sage/interfaces/gfan.py.orig 2021-05-09 16:00:11.000000000 -0600
+++ src/sage/interfaces/gfan.py 2021-05-28 11:39:54.264578894 -0600
--- src/sage/interfaces/gfan.py.orig 2022-01-30 06:41:50.000000000 -0700
+++ src/sage/interfaces/gfan.py 2022-03-04 16:16:45.901676039 -0700
@@ -61,7 +61,7 @@ class Gfan(object):
print("gfan input:\n%s" % I)
@ -78,8 +78,8 @@ diff -up src/sage/interfaces/gfan.py.orig src/sage/interfaces/gfan.py
# sometimes, gfan outputs stuff to stderr even though everything is fine
diff -up src/sage/interfaces/latte.py.orig src/sage/interfaces/latte.py
--- src/sage/interfaces/latte.py.orig 2021-05-09 16:00:11.000000000 -0600
+++ src/sage/interfaces/latte.py 2021-05-28 11:39:54.265578894 -0600
--- src/sage/interfaces/latte.py.orig 2022-01-30 06:41:50.000000000 -0700
+++ src/sage/interfaces/latte.py 2022-03-04 16:16:45.901676039 -0700
@@ -162,6 +162,7 @@ def count(arg, ehrhart_polynomial=False,
latte_proc = Popen(args,
stdin=PIPE, stdout=PIPE,
@ -97,8 +97,8 @@ diff -up src/sage/interfaces/latte.py.orig src/sage/interfaces/latte.py
ans, err = latte_proc.communicate(arg)
diff -up src/sage/interfaces/sagespawn.pyx.orig src/sage/interfaces/sagespawn.pyx
--- src/sage/interfaces/sagespawn.pyx.orig 2021-05-09 16:00:11.000000000 -0600
+++ src/sage/interfaces/sagespawn.pyx 2021-05-28 11:39:54.266578895 -0600
--- src/sage/interfaces/sagespawn.pyx.orig 2022-01-30 06:41:50.000000000 -0700
+++ src/sage/interfaces/sagespawn.pyx 2022-03-04 16:16:45.902676041 -0700
@@ -1,6 +1,6 @@
"""
Sage wrapper around pexpect's ``spawn`` class and
@ -147,8 +147,8 @@ diff -up src/sage/interfaces/sagespawn.pyx.orig src/sage/interfaces/sagespawn.py
pass
self.fileobj.close()
diff -up src/sage/libs/coxeter3/coxeter.pyx.orig src/sage/libs/coxeter3/coxeter.pyx
--- src/sage/libs/coxeter3/coxeter.pyx.orig 2021-05-09 16:00:11.000000000 -0600
+++ src/sage/libs/coxeter3/coxeter.pyx 2021-05-28 11:39:54.267578895 -0600
--- src/sage/libs/coxeter3/coxeter.pyx.orig 2022-01-30 06:41:50.000000000 -0700
+++ src/sage/libs/coxeter3/coxeter.pyx 2022-03-04 16:16:45.902676041 -0700
@@ -37,7 +37,7 @@ cdef class String:
EXAMPLES::
@ -282,9 +282,9 @@ diff -up src/sage/libs/coxeter3/coxeter.pyx.orig src/sage/libs/coxeter3/coxeter.
if rank == 0:
raise NotImplementedError("Coxeter group of type ['A',0] using Coxeter 3 not yet implemented")
diff -up src/sage/misc/sageinspect.py.orig src/sage/misc/sageinspect.py
--- src/sage/misc/sageinspect.py.orig 2021-05-28 11:01:40.384274506 -0600
+++ src/sage/misc/sageinspect.py 2021-05-28 11:39:54.269578895 -0600
@@ -462,12 +462,9 @@ class SageArgSpecVisitor(ast.NodeVisitor
--- src/sage/misc/sageinspect.py.orig 2022-03-04 15:50:57.336269352 -0700
+++ src/sage/misc/sageinspect.py 2022-03-04 16:19:08.779910689 -0700
@@ -504,12 +504,9 @@ class SageArgSpecVisitor(ast.NodeVisitor
"""
return node.id
@ -300,96 +300,27 @@ diff -up src/sage/misc/sageinspect.py.orig src/sage/misc/sageinspect.py
INPUT:
@@ -475,17 +472,21 @@ class SageArgSpecVisitor(ast.NodeVisitor
@@ -523,7 +520,7 @@ class SageArgSpecVisitor(ast.NodeVisitor
OUTPUT:
- - None, True, False.
+ - the boolean, number, or string the ``node`` represents
EXAMPLES::
- sage: import ast, sage.misc.sageinspect as sms # py3
- sage: visitor = sms.SageArgSpecVisitor() # py3
- sage: vis = lambda x: visitor.visit_NameConstant(ast.parse(x).body[0].value) # py3
- sage: [vis(n) for n in ['True', 'False', 'None']] # py3
+ sage: import ast, sage.misc.sageinspect as sms
+ sage: visitor = sms.SageArgSpecVisitor()
sage: import ast, sage.misc.sageinspect as sms
sage: visitor = sms.SageArgSpecVisitor()
- sage: vis = lambda x: visitor.visit_NameConstant(ast.parse(x).body[0].value)
+ sage: vis = lambda x: visitor.visit_Constant(ast.parse(x).body[0].value)
+ sage: [vis(n) for n in ['True', 'False', 'None']]
sage: [vis(n) for n in ['True', 'False', 'None']]
[True, False, None]
- sage: [type(vis(n)) for n in ['True', 'False', 'None']] # py3
+ sage: [type(vis(n)) for n in ['True', 'False', 'None']]
[<type 'bool'>, <type 'bool'>, <type 'NoneType'>]
+ sage: [vis(s) for s in ['"abstract"', "u'syntax'", r'''r"tr\ee"''']]
+ ['abstract', u'syntax', 'tr\\ee']
+ sage: [vis(n) for n in ['123', '0.0']]
+ [123, 0.0]
"""
return node.value
@@ -519,57 +520,6 @@ class SageArgSpecVisitor(ast.NodeVisitor
"""
return node.arg
- def visit_Num(self, node):
- """
- Visit a Python AST :class:`ast.Num` node.
-
- INPUT:
-
- - ``node`` - the node instance to visit
-
- OUTPUT:
-
- - the number the ``node`` represents
-
- EXAMPLES::
-
- sage: import ast, sage.misc.sageinspect as sms
- sage: visitor = sms.SageArgSpecVisitor()
- sage: vis = lambda x: visitor.visit_Num(ast.parse(x).body[0].value)
- sage: [vis(n) for n in ['123', '0.0', str(-pi.n())]] # py2
- [123, 0.0, -3.14159265358979]
- sage: [vis(n) for n in ['123', '0.0']] # py3
- [123, 0.0]
-
- .. NOTE::
-
- On Python 3 negative numbers are parsed first, for some reason, as
- a UnaryOp node.
- """
- return node.n
-
- def visit_Str(self, node):
- r"""
- Visit a Python AST :class:`ast.Str` node.
-
- INPUT:
-
- - ``node`` - the node instance to visit
-
- OUTPUT:
-
- - the string the ``node`` represents
-
- EXAMPLES::
-
- sage: import ast, sage.misc.sageinspect as sms
- sage: visitor = sms.SageArgSpecVisitor()
- sage: vis = lambda x: visitor.visit_Str(ast.parse(x).body[0].value)
- sage: [vis(s) for s in ['"abstract"', "u'syntax'", r'''r"tr\ee"''']]
- ['abstract', u'syntax', 'tr\\ee']
- """
- return node.s
-
def visit_List(self, node):
"""
Visit a Python AST :class:`ast.List` node.
sage: [type(vis(n)) for n in ['True', 'False', 'None']]
diff -up src/sage/plot/plot3d/plot3d.py.orig src/sage/plot/plot3d/plot3d.py
--- src/sage/plot/plot3d/plot3d.py.orig 2021-05-09 16:00:11.000000000 -0600
+++ src/sage/plot/plot3d/plot3d.py 2021-05-28 11:39:54.270578895 -0600
@@ -185,7 +185,7 @@ class _Coordinates(object):
--- src/sage/plot/plot3d/plot3d.py.orig 2022-01-30 06:41:50.000000000 -0700
+++ src/sage/plot/plot3d/plot3d.py 2022-03-06 19:41:13.399013881 -0700
@@ -148,6 +148,7 @@ from .shapes import arrow3d
from .base import Graphics3dGroup
from sage.plot.colors import rainbow
from .texture import Texture
+import inspect
from sage.functions.trig import cos, sin
from sage.misc.sageinspect import sage_getargspec, is_function_or_cython_function
@@ -182,7 +183,7 @@ class _Coordinates(object):
sage: arb((x+z,y*z,z), z, (x,y))
Arbitrary Coordinates coordinate transform (z in terms of x, y)
"""
@ -399,9 +330,9 @@ diff -up src/sage/plot/plot3d/plot3d.py.orig src/sage/plot/plot3d/plot3d.py
raise ValueError('variables were specified incorrectly for this coordinate system; incorrect variables were %s'%list(set(all_vars).symmetric_difference(set(indep_vars+[dep_var]))))
self.dep_var = dep_var
diff -up src/sage/rings/integer.pyx.orig src/sage/rings/integer.pyx
--- src/sage/rings/integer.pyx.orig 2021-05-09 16:00:11.000000000 -0600
+++ src/sage/rings/integer.pyx 2021-05-28 11:39:54.274578895 -0600
@@ -7089,7 +7089,7 @@ cdef int mpz_set_str_python(mpz_ptr z, c
--- src/sage/rings/integer.pyx.orig 2022-01-30 06:41:50.000000000 -0700
+++ src/sage/rings/integer.pyx 2022-03-04 16:16:45.904676044 -0700
@@ -7023,7 +7023,7 @@ cdef int mpz_set_str_python(mpz_ptr z, c
x += 1 # Strip spaces
# Disallow a sign here
@ -411,9 +342,9 @@ diff -up src/sage/rings/integer.pyx.orig src/sage/rings/integer.pyx
assert base >= 2
diff -up src/sage/rings/polynomial/pbori/pbori.pyx.orig src/sage/rings/polynomial/pbori/pbori.pyx
--- src/sage/rings/polynomial/pbori/pbori.pyx.orig 2021-05-09 16:00:11.000000000 -0600
+++ src/sage/rings/polynomial/pbori/pbori.pyx 2021-05-28 11:39:54.278578895 -0600
@@ -4704,8 +4704,7 @@ cdef class PolynomialConstruct:
--- src/sage/rings/polynomial/pbori/pbori.pyx.orig 2022-01-30 06:41:50.000000000 -0700
+++ src/sage/rings/polynomial/pbori/pbori.pyx 2022-03-04 16:16:45.905676046 -0700
@@ -4730,8 +4730,7 @@ cdef class PolynomialConstruct:
# So, it is just a conversion. [Simon King]
return (<BooleanPolynomialRing>ring)._element_constructor_(x)
@ -424,9 +355,9 @@ diff -up src/sage/rings/polynomial/pbori/pbori.pyx.orig src/sage/rings/polynomia
cdef class MonomialConstruct:
diff -up src/sage/rings/real_mpfi.pyx.orig src/sage/rings/real_mpfi.pyx
--- src/sage/rings/real_mpfi.pyx.orig 2021-05-28 11:01:45.006275360 -0600
+++ src/sage/rings/real_mpfi.pyx 2021-05-28 11:39:54.280578896 -0600
@@ -1944,12 +1944,12 @@ cdef class RealIntervalFieldElement(Ring
--- src/sage/rings/real_mpfi.pyx.orig 2022-03-04 15:50:57.348269369 -0700
+++ src/sage/rings/real_mpfi.pyx 2022-03-04 16:16:45.905676046 -0700
@@ -1943,12 +1943,12 @@ cdef class RealIntervalFieldElement(Ring
cdef long digits
digits = strlen(lower_s)
@ -441,7 +372,7 @@ diff -up src/sage/rings/real_mpfi.pyx.orig src/sage/rings/real_mpfi.pyx
digits -= 1
upper_expo -= digits
@@ -2118,7 +2118,7 @@ cdef class RealIntervalFieldElement(Ring
@@ -2117,7 +2117,7 @@ cdef class RealIntervalFieldElement(Ring
raise MemoryError("Unable to allocate memory for the mantissa of an interval")
mpz_get_str(tmp_cstr, base, lower_mpz)
digits = strlen(tmp_cstr)
@ -451,9 +382,9 @@ diff -up src/sage/rings/real_mpfi.pyx.orig src/sage/rings/real_mpfi.pyx
mant_string = bytes_to_str(tmp_cstr+1)
sign_string = bytes_to_str(b'-')
diff -up src/sage/rings/real_mpfr.pyx.orig src/sage/rings/real_mpfr.pyx
--- src/sage/rings/real_mpfr.pyx.orig 2021-05-09 16:00:11.000000000 -0600
+++ src/sage/rings/real_mpfr.pyx 2021-05-28 11:39:54.283578896 -0600
@@ -2095,7 +2095,7 @@ cdef class RealNumber(sage.structure.ele
--- src/sage/rings/real_mpfr.pyx.orig 2022-01-30 06:41:50.000000000 -0700
+++ src/sage/rings/real_mpfr.pyx 2022-03-04 16:16:45.906676047 -0700
@@ -2092,7 +2092,7 @@ cdef class RealNumber(sage.structure.ele
if s is NULL:
raise RuntimeError("unable to convert an mpfr number to a string")
# t contains just digits (no sign, decimal point or exponent)
@ -463,9 +394,9 @@ diff -up src/sage/rings/real_mpfr.pyx.orig src/sage/rings/real_mpfr.pyx
t = char_to_str(s + 1)
else:
diff -up src/sage/structure/sage_object.pyx.orig src/sage/structure/sage_object.pyx
--- src/sage/structure/sage_object.pyx.orig 2021-05-09 16:00:11.000000000 -0600
+++ src/sage/structure/sage_object.pyx 2021-05-28 11:39:54.284578896 -0600
@@ -688,7 +688,7 @@ cdef class SageObject:
--- src/sage/structure/sage_object.pyx.orig 2022-01-30 06:41:50.000000000 -0700
+++ src/sage/structure/sage_object.pyx 2022-03-04 16:16:45.906676047 -0700
@@ -690,7 +690,7 @@ cdef class SageObject:
try:
s = self._interface_init_(I)
except Exception:
@ -475,9 +406,9 @@ diff -up src/sage/structure/sage_object.pyx.orig src/sage/structure/sage_object.
if c:
try:
diff -up src/sage/symbolic/expression.pyx.orig src/sage/symbolic/expression.pyx
--- src/sage/symbolic/expression.pyx.orig 2021-05-28 11:01:45.016275362 -0600
+++ src/sage/symbolic/expression.pyx 2021-05-28 11:39:54.289578896 -0600
@@ -13201,7 +13201,7 @@ cdef class hold_class:
--- src/sage/symbolic/expression.pyx.orig 2022-03-04 16:01:04.179126250 -0700
+++ src/sage/symbolic/expression.pyx 2022-03-04 16:16:45.908676050 -0700
@@ -14016,7 +14016,7 @@ cdef class hold_class:
sage: SR(2)^5
32
"""
@ -486,7 +417,7 @@ diff -up src/sage/symbolic/expression.pyx.orig src/sage/symbolic/expression.pyx
def __exit__(self, *args):
"""
@@ -13214,7 +13214,7 @@ cdef class hold_class:
@@ -14029,7 +14029,7 @@ cdef class hold_class:
sage: SR(2)^5
32
"""