[sagemath] 05/06: Update patches (part 3).
Tobias Hansen
thansen at moszumanska.debian.org
Thu Jan 19 00:32:06 UTC 2017
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch experimental
in repository sagemath.
commit f57a8eaea709a2bf9904dd98ec21e04134cea550
Author: Tobias Hansen <thansen at debian.org>
Date: Thu Jan 19 00:27:02 2017 +0000
Update patches (part 3).
---
debian/changelog | 1 +
debian/patches/d0-pari-stackwarn.patch | 28 ++++++++++++++--------------
debian/patches/d0-pari.patch | 29 +++--------------------------
3 files changed, 18 insertions(+), 40 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1c88358..89f23cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ sagemath (7.5.1-1) UNRELEASED; urgency=medium
- u2-allow-override-sage-local.patch
- u2-fix-trivial-test-cases.patch
- u2-fix-less-trivial-test-cases.patch
+ - d0-pari.patch
-- Tobias Hansen <thansen at debian.org> Wed, 18 Jan 2017 22:58:31 +0000
diff --git a/debian/patches/d0-pari-stackwarn.patch b/debian/patches/d0-pari-stackwarn.patch
index 1d7a237..2f50279 100644
--- a/debian/patches/d0-pari-stackwarn.patch
+++ b/debian/patches/d0-pari-stackwarn.patch
@@ -3,9 +3,9 @@ Description: Set the default size of the PARI stack to 16*10^6 bytes
of pari increasing the stack size which caused tests to fail.
Author: Tobias Hansen <thansen at debian.org>
---- a/sage/src/sage/libs/pari/pari_instance.pyx
-+++ b/sage/src/sage/libs/pari/pari_instance.pyx
-@@ -464,7 +464,7 @@
+--- a/sage/src/sage/libs/cypari2/pari_instance.pyx
++++ b/sage/src/sage/libs/cypari2/pari_instance.pyx
+@@ -455,7 +455,7 @@
@cython.final
cdef class PariInstance(PariInstance_auto):
@@ -14,7 +14,7 @@ Author: Tobias Hansen <thansen at debian.org>
"""
Initialize the PARI system.
-@@ -1242,7 +1242,7 @@
+@@ -857,7 +857,7 @@
EXAMPLES::
sage: pari.stacksize()
@@ -23,7 +23,7 @@ Author: Tobias Hansen <thansen at debian.org>
sage: pari.allocatemem(2^18, silent=True)
sage: pari.stacksize()
262144
-@@ -1316,6 +1316,7 @@
+@@ -931,6 +931,7 @@
stack size::
sage: a = pari('2^100000000')
@@ -31,7 +31,7 @@ Author: Tobias Hansen <thansen at debian.org>
``a`` is now a Python variable on the Python heap and does not
take up any space on the PARI stack. The PARI stack is still
-@@ -1342,6 +1343,7 @@
+@@ -957,6 +958,7 @@
sage: pari.allocatemem(1, 2^26)
PARI stack size set to 1024 bytes, maximum size set to 67108864
sage: a = pari(2)^100000000
@@ -69,7 +69,7 @@ Author: Tobias Hansen <thansen at debian.org>
Curves defined over a non-prime field are supported as well::
--- a/sage/src/sage/rings/number_field/number_field_element.pyx
+++ b/sage/src/sage/rings/number_field/number_field_element.pyx
-@@ -2399,6 +2399,7 @@
+@@ -2394,6 +2394,7 @@
sage: f = x^9 + (zeta22^9 - zeta22^6 + zeta22^4 + 1)*x^8 + (2*zeta22^8 + 4*zeta22^7 - 6*zeta22^5 - 205*zeta22^4 - 6*zeta22^3 + 4*zeta22 + 2)*x^7 + (181*zeta22^9 - 354*zeta22^8 + 145*zeta22^7 - 253*zeta22^6 + 145*zeta22^5 - 354*zeta22^4 + 181*zeta22^3 + 189*zeta22 - 189)*x^6 + (902*zeta22^9 + 13116*zeta22^8 + 902*zeta22^7 - 500*zeta22^5 - 322*zeta22^4 - 176*zeta22^3 + 176*zeta22^2 + 322*zeta22 + 500)*x^5 + (13196*zeta22^9 + 548*zeta22^8 + 9176*zeta22^7 - 17964*zeta22^6 + 8512 [...]
sage: L.<a> = K.extension(f)
sage: alpha = (a^8 + (zeta22^9 - zeta22^6 + 2*zeta22^4 + 33)*a^7)/(10**2555) #long time
@@ -119,7 +119,7 @@ Author: Tobias Hansen <thansen at debian.org>
Graphics object consisting of 1 graphics primitive
--- a/sage/src/sage/rings/integer.pyx
+++ b/sage/src/sage/rings/integer.pyx
-@@ -6520,6 +6520,7 @@
+@@ -6518,6 +6518,7 @@
....: (2^100).binomial(2^22, algorithm='pari')
....: except AlarmInterrupt:
....: pass
@@ -202,9 +202,9 @@ Author: Tobias Hansen <thansen at debian.org>
"""
from sage.lfunctions.lcalc import lcalc
return lcalc.twist_zeros(n, dmin, dmax, L=self.__E)
---- a/sage/src/sage/libs/pari/gen.pyx
-+++ b/sage/src/sage/libs/pari/gen.pyx
-@@ -44,6 +44,7 @@
+--- a/sage/src/sage/libs/cypari2/gen.pyx
++++ b/sage/src/sage/libs/cypari2/gen.pyx
+@@ -47,6 +47,7 @@
sage: x = polygen(ZpFM(3,10))
sage: pol = ((x-1)^50 + x)
sage: pari(pol).poldisc()
@@ -248,9 +248,9 @@ Author: Tobias Hansen <thansen at debian.org>
[[(0, 0)],
[(0, 1), (0, -1), (1, 0), (-1, 0)],
[(1, 1), (-1, -1), (1, -1), (-1, 1)],
---- a/sage/src/sage/libs/pari/handle_error.pyx
-+++ b/sage/src/sage/libs/pari/handle_error.pyx
-@@ -197,6 +197,7 @@
+--- a/sage/src/sage/libs/cypari2/handle_error.pyx
++++ b/sage/src/sage/libs/cypari2/handle_error.pyx
+@@ -199,6 +199,7 @@
sage: pari.allocatemem(2^12, 2^26)
PARI stack size set to 4096 bytes, maximum size set to 67108864
sage: x = pari('2^(2^26)')
diff --git a/debian/patches/d0-pari.patch b/debian/patches/d0-pari.patch
index debf040..f9e1441 100644
--- a/debian/patches/d0-pari.patch
+++ b/debian/patches/d0-pari.patch
@@ -1,6 +1,6 @@
--- a/sage/src/sage/interfaces/gp.py
+++ b/sage/src/sage/interfaces/gp.py
-@@ -246,9 +246,9 @@
+@@ -249,9 +249,9 @@
# list of directories where gp will look for scripts (only current working directory)
self._eval_line('default(path,".");')
# location of elldata, seadata, galdata
@@ -12,20 +12,8 @@
# logfile disabled since Expect already logs
self._eval_line('default(log,0);')
# set random seed
---- a/sage/src/sage_setup/autogen/pari/parser.py
-+++ b/sage/src/sage_setup/autogen/pari/parser.py
-@@ -43,8 +43,7 @@
- sage: pari_share()
- '.../share/pari'
- """
-- SAGE_LOCAL = os.environ["SAGE_LOCAL"]
-- return os.path.join(SAGE_LOCAL, "share", "pari")
-+ return os.path.join("/usr", "share", "pari")
-
- paren_re = re.compile(r"[(](.*)[)]")
- argname_re = re.compile(r"[ {]*([A-Za-z_][A-Za-z0-9_]*)")
---- a/sage/src/sage/libs/pari/paripriv.pxd
-+++ b/sage/src/sage/libs/pari/paripriv.pxd
+--- a/sage/src/sage/libs/cypari2/paripriv.pxd
++++ b/sage/src/sage/libs/cypari2/paripriv.pxd
@@ -26,5 +26,5 @@
extern gp_data* GP_DATA
@@ -34,14 +22,3 @@
- char* closure_func_err()
+#cdef extern from 'pari/anal.h':
+cdef extern char* closure_func_err()
---- a/sage/src/generate_py_source.mk
-+++ b/sage/src/generate_py_source.mk
-@@ -5,7 +5,7 @@
-
- # Auto-generated files
- # TODO: Adjustments for VPATH builds will be necessary.
--sage/libs/pari/auto_gen.pxi: $(SAGE_LOCAL)/share/pari/pari.desc \
-+sage/libs/pari/auto_gen.pxi: /usr/share/pari/pari.desc \
- sage/libs/pari/decl.pxi sage_setup/autogen/pari/*.py
- python -c "from sage_setup.autogen.pari import rebuild; rebuild()"
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagemath.git
More information about the debian-science-commits
mailing list