teldra
/
vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sagemath: fix for python 3.11 

Closes: #40369 [via git-merge-pr]
This commit is contained in:
Gonzalo Tornaría 2022-11-06 17:38:53 -03:00 committed by Andrew J. Hesford
parent 06a5b90db3
commit 6d6ed30fdd
4 changed files with 1482 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
srcpkgs/sagemath/patches/trac-33842-python-3.11.patch → srcpkgs/sagemath/patches/trac-33842-01-python_3.11-de38bac21e2.patch
View File

@ -1,6 +1,20 @@
From de38bac21e276c6dba95b8b33f7457a0ac56bdeb Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Tue, 25 Oct 2022 19:43:53 -0700
Subject: [PATCH] src/sage: Apply python-3.11.patch from
https://github.com/void-linux/void-packages/commit/6229f313450ecae88743b4d5e99da2ed4de44e07
---
src/sage/cpython/cython_metaclass.h | 2 +-
src/sage/libs/gmp/pylong.pyx | 8 +++-----
src/sage/symbolic/ginac/numeric.cpp | 1 -
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/sage/cpython/cython_metaclass.h b/src/sage/cpython/cython_metaclass.h
index cc620a4dac7..6487342b71e 100644
--- a/src/sage/cpython/cython_metaclass.h
+++ b/src/sage/cpython/cython_metaclass.h
@@ -66,7 +66,7 @@
@@ -66,7 +66,7 @@ static CYTHON_INLINE int Sage_PyType_Ready(PyTypeObject* t)
}
/* Now, set t.__class__ to metaclass */
@ -9,19 +23,11 @@
PyType_Modified(t);
}
else
--- a/src/sage/symbolic/ginac/numeric.cpp
+++ b/src/sage/symbolic/ginac/numeric.cpp
@@ -52,7 +52,6 @@
#define register
#define PY_SSIZE_T_CLEAN
#include <Python.h>
-#include <longintrepr.h>
#include "flint/fmpz.h"
#include "flint/fmpz_factor.h"
diff --git a/src/sage/libs/gmp/pylong.pyx b/src/sage/libs/gmp/pylong.pyx
index 388be32c55e..e772b60e3e0 100644
--- a/src/sage/libs/gmp/pylong.pyx
+++ b/src/sage/libs/gmp/pylong.pyx
@@ -32,7 +32,7 @@
@@ -32,7 +32,7 @@ from cpython.longintrepr cimport _PyLong_New, py_long, digit, PyLong_SHIFT
from .mpz cimport *
cdef extern from *:
@ -30,7 +36,7 @@
int hash_bits """
#ifdef _PyHASH_BITS
_PyHASH_BITS /* Python 3 */
@@ -57,10 +57,8 @@
@@ -57,10 +57,8 @@ cdef mpz_get_pylong_large(mpz_srcptr z):
mpz_export(L.ob_digit, NULL,
-1, sizeof(digit), 0, PyLong_nails, z)
if mpz_sgn(z) < 0:
@ -43,3 +49,18 @@
return L
diff --git a/src/sage/symbolic/ginac/numeric.cpp b/src/sage/symbolic/ginac/numeric.cpp
index 22060441760..b40ed64edb5 100644
--- a/src/sage/symbolic/ginac/numeric.cpp
+++ b/src/sage/symbolic/ginac/numeric.cpp
@@ -52,7 +52,6 @@
#define register
#define PY_SSIZE_T_CLEAN
#include <Python.h>
-#include <longintrepr.h>
#include "flint/fmpz.h"
#include "flint/fmpz_factor.h"
--
2.38.1

168
srcpkgs/sagemath/patches/trac-33842-02-python_3.11-argspec-fix-9eb08f3afde.patch Normal file
View File

@ -0,0 +1,168 @@
From 9eb08f3afde3266bbd667e196513240a0fe245f4 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Tue, 25 Oct 2022 22:52:56 -0700
Subject: [PATCH] inspect.ArgSpec -> inspect.FullArgSpec
---
src/sage/misc/cachefunc.pyx | 4 ++--
src/sage/misc/decorators.py | 6 ++++--
src/sage/misc/function_mangling.pyx | 2 +-
src/sage/misc/sageinspect.py | 24 +++++++++++++-----------
4 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/sage/misc/cachefunc.pyx b/src/sage/misc/cachefunc.pyx
index 9fa967ce737..72042ef13d6 100644
--- a/src/sage/misc/cachefunc.pyx
+++ b/src/sage/misc/cachefunc.pyx
@@ -2818,7 +2818,7 @@ cdef class CachedMethod():
except Exception:
pass
if self.nargs == 0:
- args, varargs, keywords, defaults = sage_getargspec(f)
+ args, varargs, keywords, defaults, kwonlyargs, kwonlydefaults, annotations = sage_getargspec(f)
if varargs is None and keywords is None and len(args)<=1:
self.nargs = 1
else:
@@ -2954,7 +2954,7 @@ cdef class CachedSpecialMethod(CachedMethod):
# we need to analyse the argspec
f = self._cachedfunc.f
if self.nargs == 0:
- args, varargs, keywords, defaults = sage_getargspec(f)
+ args, varargs, keywords, defaults, kwonlyargs, kwonlydefaults, annotations = sage_getargspec(f)
if varargs is None and keywords is None and len(args)<=1:
self.nargs = 1
Caller = CachedMethodCallerNoArgs(inst, f, name=name, do_pickle=self._cachedfunc.do_pickle)
diff --git a/src/sage/misc/decorators.py b/src/sage/misc/decorators.py
index 28c52448813..311a5105739 100644
--- a/src/sage/misc/decorators.py
+++ b/src/sage/misc/decorators.py
@@ -32,7 +32,8 @@ from copy import copy
from sage.misc.sageinspect import (sage_getsource, sage_getsourcelines,
sage_getargspec)
-from inspect import ArgSpec
+
+from inspect import FullArgSpec
def sage_wraps(wrapped, assigned=WRAPPER_ASSIGNMENTS, updated=WRAPPER_UPDATES):
@@ -499,7 +500,8 @@ class options():
list(self.options))
defaults = (argspec.defaults or ()) + tuple(self.options.values())
# Note: argspec.defaults is not always a tuple for some reason
- return ArgSpec(args, argspec.varargs, argspec.keywords, defaults)
+ return FullArgSpec(args, argspec.varargs, argspec.keywords, defaults,
+ kwonlyargs=[], kwonlydefaults={}, annotations={})
wrapper._sage_argspec_ = argspec
diff --git a/src/sage/misc/function_mangling.pyx b/src/sage/misc/function_mangling.pyx
index 0ac03cf0715..e1bb7978953 100644
--- a/src/sage/misc/function_mangling.pyx
+++ b/src/sage/misc/function_mangling.pyx
@@ -116,7 +116,7 @@ cdef class ArgumentFixer:
"""
def __init__(self, f, classmethod = False):
try:
- arg_names, varargs, varkw, defaults = sage_getargspec(f)
+ arg_names, varargs, varkw, defaults, kwonlyargs, kwonlydefaults, annotations = sage_getargspec(f)
except AttributeError:
# This error occurs if f is defined in a Cython file and the
# source file has gone.
diff --git a/src/sage/misc/sageinspect.py b/src/sage/misc/sageinspect.py
index fbca2defc20..a3821cb56b9 100644
--- a/src/sage/misc/sageinspect.py
+++ b/src/sage/misc/sageinspect.py
@@ -359,7 +359,7 @@ def _extract_embedded_signature(docstring, name):
docstring = L[1] if len(L) > 1 else '' # Remove first line, keep the rest
def_string = "def " + name + signature + ": pass"
try:
- return docstring, inspect.ArgSpec(*_sage_getargspec_cython(def_string))
+ return docstring, inspect.FullArgSpec(*_sage_getargspec_cython(def_string))
except SyntaxError:
docstring = os.linesep.join(L)
return docstring, None
@@ -1135,8 +1135,9 @@ def _sage_getargspec_from_ast(source):
vararg = getattr(ast_args.vararg, 'arg', None)
kwarg = getattr(ast_args.kwarg, 'arg', None)
- return inspect.ArgSpec(args, vararg, kwarg,
- tuple(defaults) if defaults else None)
+ return inspect.FullArgSpec(args, vararg, kwarg,
+ tuple(defaults) if defaults else None,
+ kwonlyargs=[], kwonlydefaults={}, annotations={})
def _sage_getargspec_cython(source):
@@ -1152,7 +1153,7 @@ def _sage_getargspec_cython(source):
OUTPUT:
- - an instance of :obj:`inspect.ArgSpec`, i.e., a named tuple
+ - an instance of :class:`inspect.FullArgSpec`, i.e., a named tuple
EXAMPLES::
@@ -1662,11 +1663,11 @@ def sage_getargspec(obj):
return sage_getargspec(obj.__call__)
if isinstance(obj, (lazy_attribute, AbstractMethod)):
source = sage_getsource(obj)
- return inspect.ArgSpec(*_sage_getargspec_cython(source))
+ return inspect.FullArgSpec(*_sage_getargspec_cython(source))
if not callable(obj):
raise TypeError("obj is not a code object")
try:
- return inspect.ArgSpec(*obj._sage_argspec_())
+ return inspect.FullArgSpec(*obj._sage_argspec_())
except (AttributeError, TypeError):
pass
# If we are lucky, the function signature is embedded in the docstring.
@@ -1682,7 +1683,7 @@ def sage_getargspec(obj):
# Note that this may give a wrong result for the constants!
try:
args, varargs, varkw = inspect.getargs(obj.__code__)
- return inspect.ArgSpec(args, varargs, varkw, obj.__defaults__)
+ return inspect.FullArgSpec(args, varargs, varkw, obj.__defaults__)
except (TypeError, AttributeError):
pass
if isclassinstance(obj):
@@ -1717,7 +1718,7 @@ def sage_getargspec(obj):
except TypeError: # happens for Python builtins
source = ''
if source:
- return inspect.ArgSpec(*_sage_getargspec_cython(source))
+ return inspect.FullArgSpec(*_sage_getargspec_cython(source))
else:
func_obj = obj
@@ -1730,7 +1731,7 @@ def sage_getargspec(obj):
except TypeError: # arg is not a code object
# The above "hopefully" was wishful thinking:
try:
- return inspect.ArgSpec(*_sage_getargspec_cython(sage_getsource(obj)))
+ return inspect.FullArgSpec(*_sage_getargspec_cython(sage_getsource(obj)))
except TypeError: # This happens for Python builtins
# The best we can do is to return a generic argspec
args = []
@@ -1740,7 +1741,8 @@ def sage_getargspec(obj):
defaults = func_obj.__defaults__
except AttributeError:
defaults = None
- return inspect.ArgSpec(args, varargs, varkw, defaults)
+ return inspect.FullArgSpec(args, varargs, varkw, defaults,
+ kwonlyargs=[], kwonlydefaults={}, annotations={})
def formatannotation(annotation, base_module=None):
@@ -1811,7 +1813,7 @@ def sage_formatargspec(args, varargs=None, varkw=None, defaults=None,
: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
- ``inspect.ArgSpec``.
+ ``inspect.FullArgSpec``.
EXAMPLES::
--
2.38.1

1279
srcpkgs/sagemath/patches/trac-33842-03-python3.11-final_fixes-7b6fa565f42.patch Normal file
View File

File diff suppressed because it is too large Load Diff

2
srcpkgs/sagemath/template
View File

@ -1,7 +1,7 @@
# Template file for 'sagemath'
pkgname=sagemath
version=9.7
revision=2
revision=3
wrksrc=sage-$version
build_wrksrc=pkgs/sagemath-standard
build_style=python3-module