Skip to content

fix for python 3.11 #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 3, 2022
Merged

fix for python 3.11 #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e741737
Python 3.10 compatibility
jamesjer Nov 16, 2020
ae4f776
add workflow for python 3.11
Oct 1, 2022
f6bee28
only depend on Cython 0.29 instead of 0.29.20
Oct 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11.0-rc.2']
pari-version: ['pari-2.9.4', 'pari-2.9.5', 'pari-2.11.0', 'pari-2.11.0', 'pari-2.11.2', 'pari-2.11.3', 'pari-2.11.4', 'pari-2.13.0', 'snapshot']
env:
LC_ALL: C
Expand Down
8 changes: 8 additions & 0 deletions cypari2/Py_SET_SIZE.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#include "Python.h"

#if (PY_MAJOR_VERSION == 3) && (PY_MINOR_VERSION < 9)
// The function Py_SET_SIZE is defined starting with python 3.9.
void Py_SET_SIZE(PyVarObject *o, Py_ssize_t size){
Py_SIZE(o) = size;
}
#endif
3 changes: 2 additions & 1 deletion cypari2/convert.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ from .gen cimport Gen
from cpython.int cimport PyInt_AS_LONG
from cpython.float cimport PyFloat_AS_DOUBLE
from cpython.complex cimport PyComplex_RealAsDouble, PyComplex_ImagAsDouble
from cpython.longintrepr cimport py_long


# Conversion PARI -> Python
Expand Down Expand Up @@ -59,7 +60,7 @@ cdef inline GEN doubles_to_COMPLEX(double re, double im):
cdef inline GEN PyInt_AS_GEN(x):
return stoi(PyInt_AS_LONG(x))

cdef GEN PyLong_AS_GEN(x)
cdef GEN PyLong_AS_GEN(py_long x)

cdef inline GEN PyFloat_AS_GEN(x):
return double_to_REAL(PyFloat_AS_DOUBLE(x))
Expand Down
19 changes: 9 additions & 10 deletions cypari2/convert.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ cdef extern from *:
ctypedef struct PyLongObject:
digit* ob_digit

Py_ssize_t* Py_SIZE_PTR "&Py_SIZE"(object)
cdef extern from "Py_SET_SIZE.h":
void Py_SET_SIZE(py_long o, Py_ssize_t size)


########################################################################
Expand Down Expand Up @@ -422,8 +423,8 @@ cdef PyLong_FromINT(GEN g):
# Actual correct computed size
cdef Py_ssize_t sizedigits_final = 0

x = _PyLong_New(sizedigits)
cdef digit* D = (<PyLongObject*>x).ob_digit
cdef py_long x = _PyLong_New(sizedigits)
cdef digit* D = x.ob_digit

cdef digit d
cdef ulong w
Expand All @@ -450,13 +451,11 @@ cdef PyLong_FromINT(GEN g):
if d:
sizedigits_final = i+1

# Set correct size (use a pointer to hack around Cython's
# non-support for lvalues).
cdef Py_ssize_t* sizeptr = Py_SIZE_PTR(x)
# Set correct size
if signe(g) > 0:
sizeptr[0] = sizedigits_final
Py_SET_SIZE(x, sizedigits_final)
else:
sizeptr[0] = -sizedigits_final
Py_SET_SIZE(x, -sizedigits_final)

return x

Expand All @@ -465,8 +464,8 @@ cdef PyLong_FromINT(GEN g):
# Conversion Python -> PARI
########################################################################

cdef GEN PyLong_AS_GEN(x):
cdef const digit* D = (<PyLongObject*>x).ob_digit
cdef GEN PyLong_AS_GEN(py_long x):
cdef const digit* D = x.ob_digit

# Size of the input
cdef size_t sizedigits
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def run(self):
setup(
name='cypari2',
version=VERSION,
setup_requires=['Cython>=0.28'],
setup_requires=['Cython>=0.29'],
install_requires=['cysignals>=1.7'],
description="A Python interface to the number theory library PARI/GP",
long_description=README,
Expand Down