[sagemath] 06/10: Refresh patches, remove parts of d0-libgap-sage.patch and d0-pari-stackwarn.patch that do not apply anymore.
Tobias Hansen
thansen at moszumanska.debian.org
Fri Jun 9 21:34:43 UTC 2017
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch master
in repository sagemath.
commit ddebad709cbe5825e01d00a46adad2aa30379b54
Author: Tobias Hansen <thansen at debian.org>
Date: Fri Jun 9 21:34:35 2017 +0100
Refresh patches, remove parts of d0-libgap-sage.patch and d0-pari-stackwarn.patch that do not apply anymore.
---
debian/changelog | 2 +
debian/patches/d0-libgap-sage.patch | 28 +-----------
debian/patches/d0-maxima.patch | 16 +++----
debian/patches/d0-nauty.patch | 2 +-
debian/patches/d0-pari-stackwarn.patch | 83 ++--------------------------------
debian/patches/d0-pari.patch | 2 +-
6 files changed, 18 insertions(+), 115 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b11e1eb..f30fbbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ sagemath (8.0~beta9-1) UNRELEASED; urgency=medium
* Patches with non-trivial modifications:
- u2-allow-override-sage-local.patch:
May need further modifications after https://trac.sagemath.org/ticket/21479
+ - d0-libgap-sage.patch
+ - d0-pari-stackwarn.patch
-- Tobias Hansen <thansen at debian.org> Thu, 08 Jun 2017 21:19:49 +0000
diff --git a/debian/patches/d0-libgap-sage.patch b/debian/patches/d0-libgap-sage.patch
index 6b50858..d3b8560 100644
--- a/debian/patches/d0-libgap-sage.patch
+++ b/debian/patches/d0-libgap-sage.patch
@@ -56,7 +56,7 @@ Forwarded: not-needed
"m", "readline", "Lfunction" ,
] + cblas_libs + [
"cryptominisat",
-@@ -637,15 +641,15 @@
+@@ -645,15 +649,15 @@
Extension('sage.libs.gap.util',
sources = ["sage/libs/gap/util.pyx"],
@@ -75,29 +75,3 @@ Forwarded: not-needed
###################################
##
---- a/sage/src/setup.py
-+++ b/sage/src/setup.py
-@@ -179,6 +179,12 @@
- "ntl": [ os.path.join(SAGE_INC, 'NTL', 'config.h') ]
- }
-
-+import pkgconfig
-+# LibGAP
-+libgap_pc = pkgconfig.parse('libgap-sage')
-+libgap_library_dirs = list(libgap_pc['library_dirs'])
-+libgap_include_dirs = list(libgap_pc['include_dirs'])
-+
- # In the loop below, don't append to any list, since many of these
- # lists are actually identical Python objects. For every list, we need
- # to write (at least the first time):
-@@ -196,8 +202,8 @@
-
- m.extra_compile_args = m.extra_compile_args + extra_compile_args
- m.extra_link_args = m.extra_link_args + extra_link_args
-- m.library_dirs = m.library_dirs + [os.path.join(SAGE_LOCAL, "lib")]
-- m.include_dirs = m.include_dirs + include_dirs
-+ m.library_dirs = m.library_dirs + libgap_library_dirs + [os.path.join(SAGE_LOCAL, "lib")]
-+ m.include_dirs = m.include_dirs + libgap_include_dirs + include_dirs
-
-
- #############################################
diff --git a/debian/patches/d0-maxima.patch b/debian/patches/d0-maxima.patch
index 335e329..e8eec81 100644
--- a/debian/patches/d0-maxima.patch
+++ b/debian/patches/d0-maxima.patch
@@ -4,7 +4,7 @@ Author: Tobias Hansen <thansen at debian.org>
--- a/sage/src/sage/interfaces/maxima_lib.py
+++ b/sage/src/sage/interfaces/maxima_lib.py
-@@ -98,7 +98,7 @@
+@@ -101,7 +101,7 @@
## We begin here by initializing Maxima in library mode
## i.e. loading it into ECL
ecl_eval("(setf *load-verbose* NIL)")
@@ -15,7 +15,7 @@ Author: Tobias Hansen <thansen at debian.org>
ecl_eval("(defvar *MAXIMA-LANG-SUBDIR* NIL)")
--- a/sage/src/sage/interfaces/maxima.py
+++ b/sage/src/sage/interfaces/maxima.py
-@@ -556,7 +556,7 @@
+@@ -555,7 +555,7 @@
Expect.__init__(self,
name = 'maxima',
prompt = '\(\%i[0-9]+\) ',
@@ -24,7 +24,7 @@ Author: Tobias Hansen <thansen at debian.org>
script_subdirectory = script_subdirectory,
restart_on_ctrlc = False,
verbose_start = False,
-@@ -789,7 +789,7 @@
+@@ -788,7 +788,7 @@
if not wait_for_prompt:
return
# line_echo sometimes has randomly inserted terminal echo in front #15811
@@ -35,7 +35,7 @@ Author: Tobias Hansen <thansen at debian.org>
out = self._before() # input echo + output prompt + output
--- a/sage/src/sage/interfaces/maxima_abstract.py
+++ b/sage/src/sage/interfaces/maxima_abstract.py
-@@ -165,7 +165,7 @@
+@@ -164,7 +164,7 @@
-- Function: gcd (<p_1>, <p_2>, <x_1>, ...)
...
"""
@@ -44,7 +44,7 @@ Author: Tobias Hansen <thansen at debian.org>
if sage.server.support.EMBEDDED_MODE:
cmd += '< /dev/null'
-@@ -173,10 +173,7 @@
+@@ -172,10 +172,7 @@
p = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
res = p.stdout.read()
@@ -56,7 +56,7 @@ Author: Tobias Hansen <thansen at debian.org>
return AsciiArtString(res)
else:
subprocess.Popen(cmd, shell=True)
-@@ -2215,7 +2212,7 @@
+@@ -2188,7 +2185,7 @@
sage: maxima_version()
'5.39.0'
"""
@@ -65,7 +65,7 @@ Author: Tobias Hansen <thansen at debian.org>
def maxima_console():
"""
-@@ -2231,4 +2228,4 @@
+@@ -2204,4 +2201,4 @@
from sage.repl.rich_output.display_manager import get_display_manager
if not get_display_manager().is_in_terminal():
raise RuntimeError('Can use the console only in the terminal. Try %%maxima magics instead.')
@@ -84,7 +84,7 @@ Author: Tobias Hansen <thansen at debian.org>
...
--- a/sage/src/bin/sage
+++ b/sage/src/bin/sage
-@@ -539,7 +539,7 @@
+@@ -540,7 +540,7 @@
if [ "$1" = '-maxima' -o "$1" = '--maxima' ]; then
shift
diff --git a/debian/patches/d0-nauty.patch b/debian/patches/d0-nauty.patch
index f30a098..469e153 100644
--- a/debian/patches/d0-nauty.patch
+++ b/debian/patches/d0-nauty.patch
@@ -1,6 +1,6 @@
--- a/sage/src/sage/graphs/graph_generators.py
+++ b/sage/src/sage/graphs/graph_generators.py
-@@ -872,10 +872,10 @@
+@@ -878,10 +878,10 @@
sage: gen = graphs.nauty_geng("4", debug=True)
sage: print(next(gen))
diff --git a/debian/patches/d0-pari-stackwarn.patch b/debian/patches/d0-pari-stackwarn.patch
index 87c2140..78e9afb 100644
--- a/debian/patches/d0-pari-stackwarn.patch
+++ b/debian/patches/d0-pari-stackwarn.patch
@@ -3,69 +3,6 @@ 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/cypari2/pari_instance.pyx
-+++ b/sage/src/sage/libs/cypari2/pari_instance.pyx
-@@ -461,7 +461,7 @@
-
- # Take 1MB as minimal stack. Use maxprime=0, which PARI will
- # internally increase to some small value like 65537.
-- pari_init_opts(1000000, 0, INIT_DFTm)
-+ pari_init_opts(16000000, 0, INIT_DFTm)
-
- # Disable PARI's stack overflow checking which is incompatible
- # with multi-threading.
-@@ -533,7 +533,7 @@
- True
- sage: pari2 = Pari(10**6)
- sage: pari.stacksize(), pari2.stacksize()
-- (10000000, 10000000)
-+ (16000000, 16000000)
-
- For more information about how precision works in the PARI
- interface, see :mod:`sage.libs.cypari2.pari_instance`.
-@@ -593,7 +593,7 @@
- sage: pari2._close()
- sage: pari2 = Pari(10**6)
- sage: pari.stacksize()
-- 1000000
-+ 16000000
-
- .. WARNING::
-
-@@ -875,7 +875,7 @@
- EXAMPLES::
-
- sage: pari.stacksize()
-- 1000000
-+ 16000000
- sage: pari.allocatemem(2**18, silent=True)
- sage: pari.stacksize()
- 262144
-@@ -949,6 +949,7 @@
- stack size::
-
- sage: a = pari('2^100000000')
-+ *** _^s: Warning: increasing stack size to...
-
- ``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
-@@ -964,7 +965,7 @@
- sage: a = pari('2^100000000')
- Traceback (most recent call last):
- ...
-- PariError: _^s: the PARI stack overflows (current size: 1000000; maximum size: 4194304)
-+ PariError: _^s: the PARI stack overflows (current size:...; maximum size: 4194304)
- You can use pari.allocatemem() to change the stack size and try again
-
- TESTS:
-@@ -975,6 +976,7 @@
- sage: pari.allocatemem(1, 2**26)
- PARI stack size set to 1024 bytes, maximum size set to 67108864
- sage: a = pari(2)**100000000
-+ *** Warning: increasing stack size to...
- sage: pari.stacksize() # random
- 12500024
-
--- a/sage/src/sage/schemes/elliptic_curves/ell_rational_field.py
+++ b/sage/src/sage/schemes/elliptic_curves/ell_rational_field.py
@@ -1483,6 +1483,7 @@
@@ -96,7 +33,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
-@@ -2444,6 +2444,7 @@
+@@ -2445,6 +2445,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
@@ -106,7 +43,7 @@ Author: Tobias Hansen <thansen at debian.org>
1
--- a/sage/src/sage/schemes/elliptic_curves/heegner.py
+++ b/sage/src/sage/schemes/elliptic_curves/heegner.py
-@@ -4689,6 +4689,7 @@
+@@ -4691,6 +4691,7 @@
sage: H = heegner_points(11).reduce_mod(3)
sage: R = H.left_orders()[0]
sage: H.optimal_embeddings(-7, 1, R)
@@ -146,7 +83,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 @@
+@@ -6536,6 +6536,7 @@
....: (2^100).binomial(2^22, algorithm='pari')
....: except AlarmInterrupt:
....: pass
@@ -215,7 +152,7 @@ Author: Tobias Hansen <thansen at debian.org>
sage: E = EllipticCurve('37a')
sage: vals = E.lseries().twist_values(1, -12, -4)
+ *** Warning: increasing stack size to...
- sage: vals # abs tol 1e-17
+ sage: vals # abs tol 1e-15
[(-11, 1.47824342), (-8, 8.9590946e-18), (-7, 1.85307619), (-4, 2.45138938)]
sage: F = E.quadratic_twist(-8)
@@ -414,7 +419,9 @@
@@ -257,7 +194,7 @@ Author: Tobias Hansen <thansen at debian.org>
L = self._compute_L(L)
--- a/sage/src/sage/quadratic_forms/quadratic_form__ternary_Tornaria.py
+++ b/sage/src/sage/quadratic_forms/quadratic_form__ternary_Tornaria.py
-@@ -555,6 +555,7 @@
+@@ -556,6 +556,7 @@
sage: Q = DiagonalQuadraticForm(ZZ, [1, 1])
sage: Q.representation_vector_list(10)
@@ -265,16 +202,6 @@ 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/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)')
-+ *** _^_: Warning: increasing stack size to...
- sage: x == 2**(2**26)
- True
-
--- a/sage/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/elliptic_curves.rst
+++ b/sage/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/elliptic_curves.rst
@@ -372,6 +372,15 @@
diff --git a/debian/patches/d0-pari.patch b/debian/patches/d0-pari.patch
index c1ac1cc..6a17992 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
-@@ -249,9 +249,9 @@
+@@ -250,9 +250,9 @@
# list of directories where gp will look for scripts (only current working directory)
self._eval_line('default(path,".");')
# location of elldata, seadata, galdata
--
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