[sagemath] 04/07: Refresh more patches for sage 7.6.rc1.
Tobias Hansen
thansen at moszumanska.debian.org
Sat Mar 18 13:54:11 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 b21213a05e301b737b842958c7a6a4e6d8589772
Author: Tobias Hansen <thansen at debian.org>
Date: Sat Mar 18 12:42:59 2017 +0000
Refresh more patches for sage 7.6.rc1.
---
debian/patches/d0-arb.patch | 36 +++++-----
debian/patches/d0-gsl-cblas.patch | 11 ---
debian/patches/d0-libgap-sage.patch | 6 +-
debian/patches/d0-maxima.patch | 6 +-
debian/patches/d0-nauty.patch | 2 +-
debian/patches/d0-pari-stackwarn.patch | 79 +++++++---------------
debian/patches/d0-pari.patch | 10 ---
debian/patches/d0-paths-sharedata.patch | 2 +-
debian/patches/d0-paths.patch | 6 +-
debian/patches/u1-fix-dont-require-DISPLAY.patch | 10 +--
debian/patches/u1-looser-doctest-basename.patch | 2 +-
.../patches/u2-fix-less-trivial-test-cases.patch | 12 ++--
debian/patches/u2-fix-trivial-test-cases.patch | 2 +-
debian/patches/u2-reproducible-docs.patch | 2 +-
debian/patches/u2-scripts-dir.patch | 8 +--
debian/patches/u2-version-cddlib-094h.patch | 4 +-
16 files changed, 75 insertions(+), 123 deletions(-)
diff --git a/debian/patches/d0-arb.patch b/debian/patches/d0-arb.patch
index 7663d96..a0ff61a 100644
--- a/debian/patches/d0-arb.patch
+++ b/debian/patches/d0-arb.patch
@@ -6,7 +6,7 @@ Forwarded: not-needed
--- a/sage/src/module_list.py
+++ b/sage/src/module_list.py
-@@ -133,7 +133,7 @@
+@@ -132,7 +132,7 @@
"ec", "ecm",
] + linbox_libs + fflas_ffpack_libs + gsl_libs + [
"pari", "flint", "ratpoints", "ecl", "glpk", "ppl",
@@ -15,7 +15,7 @@ Forwarded: not-needed
"brial",
"brial_groebner",
"m4rie",
-@@ -824,7 +824,7 @@
+@@ -799,7 +799,7 @@
Extension("sage.matrix.matrix_complex_ball_dense",
["sage/matrix/matrix_complex_ball_dense.pyx"],
@@ -27,64 +27,64 @@ Forwarded: not-needed
--- a/sage/src/sage/libs/arb/acb.pxd
+++ b/sage/src/sage/libs/arb/acb.pxd
@@ -1,4 +1,4 @@
--# distutils: libraries = arb
-+# distutils: libraries = flint-arb
+-# distutils: libraries = gmp flint arb
++# distutils: libraries = gmp flint flint-arb
from sage.libs.arb.types cimport *
from sage.libs.flint.types cimport fmpz_t, fmpq_t
--- a/sage/src/sage/libs/arb/acb_hypgeom.pxd
+++ b/sage/src/sage/libs/arb/acb_hypgeom.pxd
@@ -1,4 +1,4 @@
--# distutils: libraries = arb
-+# distutils: libraries = flint-arb
+-# distutils: libraries = gmp flint arb
++# distutils: libraries = gmp flint flint-arb
from sage.libs.arb.types cimport *
--- a/sage/src/sage/libs/arb/acb_modular.pxd
+++ b/sage/src/sage/libs/arb/acb_modular.pxd
@@ -1,4 +1,4 @@
--# distutils: libraries = arb
-+# distutils: libraries = flint-arb
+-# distutils: libraries = gmp flint arb
++# distutils: libraries = gmp flint flint-arb
from sage.libs.arb.types cimport *
from sage.libs.flint.types cimport fmpz_poly_t
--- a/sage/src/sage/libs/arb/arb.pxd
+++ b/sage/src/sage/libs/arb/arb.pxd
@@ -1,4 +1,4 @@
--# distutils: libraries = arb
-+# distutils: libraries = flint-arb
+-# distutils: libraries = gmp flint arb
++# distutils: libraries = gmp flint flint-arb
from sage.libs.arb.types cimport *
from sage.libs.flint.types cimport fmpz_t, fmpq_t
--- a/sage/src/sage/libs/arb/arf.pxd
+++ b/sage/src/sage/libs/arb/arf.pxd
@@ -1,4 +1,4 @@
--# distutils: libraries = arb
-+# distutils: libraries = flint-arb
+-# distutils: libraries = gmp flint arb
++# distutils: libraries = gmp flint flint-arb
from sage.libs.arb.types cimport *
from sage.libs.gmp.types cimport mpz_t
--- a/sage/src/sage/libs/arb/bernoulli.pxd
+++ b/sage/src/sage/libs/arb/bernoulli.pxd
@@ -1,4 +1,4 @@
--# distutils: libraries = arb
-+# distutils: libraries = flint-arb
+-# distutils: libraries = gmp flint arb
++# distutils: libraries = gmp flint flint-arb
from ..flint.types cimport fmpq_t, ulong
--- a/sage/src/sage/libs/arb/mag.pxd
+++ b/sage/src/sage/libs/arb/mag.pxd
@@ -1,4 +1,4 @@
--# distutils: libraries = arb
-+# distutils: libraries = flint-arb
+-# distutils: libraries = gmp flint arb
++# distutils: libraries = gmp flint flint-arb
from sage.libs.arb.types cimport *
from sage.libs.flint.types cimport fmpz_t, fmpq_t
--- a/sage/src/sage/libs/arb/acb_poly.pxd
+++ b/sage/src/sage/libs/arb/acb_poly.pxd
@@ -1,4 +1,4 @@
--# distutils: libraries = arb
-+# distutils: libraries = flint-arb
+-# distutils: libraries = gmp flint arb
++# distutils: libraries = gmp flint flint-arb
from sage.libs.arb.types cimport *
from sage.libs.flint.types cimport fmpz_poly_t, fmpq_poly_t
diff --git a/debian/patches/d0-gsl-cblas.patch b/debian/patches/d0-gsl-cblas.patch
index 1a62229..13604fa 100644
--- a/debian/patches/d0-gsl-cblas.patch
+++ b/debian/patches/d0-gsl-cblas.patch
@@ -26,17 +26,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
# TODO: Remove Cygwin hack by installing a suitable cblas.pc
if os.path.exists('/usr/lib/libblas.dll.a'):
-@@ -42,9 +41,9 @@
- # GNU Scientific Library
- # Note we remove the built-in gslcblas
- # The above cblas should already be in the list thanks to #20646
-+# On Debian linking to libgsl currently requires also -lgslcblas so we do not remove it.
- gsl_pc = pkgconfig.parse('gsl')
- gsl_libs = gsl_pc['libraries']
--gsl_libs.remove('gslcblas')
- gsl_library_dirs = gsl_pc['library_dirs']
- gsl_include_dirs = gsl_pc['include_dirs']
-
--- a/sage/src/sage/misc/cython.py
+++ b/sage/src/sage/misc/cython.py
@@ -30,17 +30,16 @@
diff --git a/debian/patches/d0-libgap-sage.patch b/debian/patches/d0-libgap-sage.patch
index 79a1fa8..6b50858 100644
--- a/debian/patches/d0-libgap-sage.patch
+++ b/debian/patches/d0-libgap-sage.patch
@@ -34,7 +34,7 @@ Forwarded: not-needed
rm main.o main *~
--- a/sage/src/module_list.py
+++ b/sage/src/module_list.py
-@@ -47,6 +47,10 @@
+@@ -46,6 +46,10 @@
gsl_library_dirs = gsl_pc['library_dirs']
gsl_include_dirs = gsl_pc['include_dirs']
@@ -45,7 +45,7 @@ Forwarded: not-needed
# GD image library
gd_pc = pkgconfig.parse('gdlib')
gd_libs = gd_pc['libraries']
-@@ -137,8 +141,8 @@
+@@ -136,8 +140,8 @@
"brial_groebner",
"m4rie",
] + m4ri_libs + [
@@ -56,7 +56,7 @@ Forwarded: not-needed
"m", "readline", "Lfunction" ,
] + cblas_libs + [
"cryptominisat",
-@@ -670,15 +674,15 @@
+@@ -637,15 +641,15 @@
Extension('sage.libs.gap.util',
sources = ["sage/libs/gap/util.pyx"],
diff --git a/debian/patches/d0-maxima.patch b/debian/patches/d0-maxima.patch
index e48be16..95bd327 100644
--- a/debian/patches/d0-maxima.patch
+++ b/debian/patches/d0-maxima.patch
@@ -58,7 +58,7 @@ Author: Tobias Hansen <thansen at debian.org>
subprocess.Popen(cmd, shell=True)
@@ -2215,7 +2212,7 @@
sage: maxima_version()
- '5.35.1'
+ '5.39.0'
"""
- return os.popen('maxima --version').read().split()[-1]
+ return os.popen('maxima-sage --version').read().split()[-1]
@@ -73,7 +73,7 @@ Author: Tobias Hansen <thansen at debian.org>
+ os.system('maxima-sage')
--- a/sage/src/sage/interfaces/expect.py
+++ b/sage/src/sage/interfaces/expect.py
-@@ -565,7 +565,7 @@
+@@ -566,7 +566,7 @@
sage: a = maxima('y')
sage: maxima.quit(verbose=True)
@@ -84,7 +84,7 @@ Author: Tobias Hansen <thansen at debian.org>
...
--- a/sage/src/bin/sage
+++ b/sage/src/bin/sage
-@@ -519,7 +519,7 @@
+@@ -539,7 +539,7 @@
if [ "$1" = '-maxima' -o "$1" = '--maxima' ]; then
shift
diff --git a/debian/patches/d0-nauty.patch b/debian/patches/d0-nauty.patch
index ca4000a..f30a098 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
-@@ -871,10 +871,10 @@
+@@ -872,10 +872,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 acd44b0..daa69d5 100644
--- a/debian/patches/d0-pari-stackwarn.patch
+++ b/debian/patches/d0-pari-stackwarn.patch
@@ -5,25 +5,25 @@ 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
-@@ -455,7 +455,7 @@
+@@ -461,7 +461,7 @@
- @cython.final
- cdef class PariInstance(PariInstance_auto):
-- def __init__(self, long size=1000000, unsigned long maxprime=500000):
-+ def __init__(self, long size=16000000, unsigned long maxprime=500000):
- """
- Initialize the PARI system.
+ # 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)
-@@ -857,7 +857,7 @@
+ # Disable PARI's stack overflow checking which is incompatible
+ # with multi-threading.
+@@ -875,7 +875,7 @@
EXAMPLES::
sage: pari.stacksize()
- 1000000
+ 16000000
- sage: pari.allocatemem(2^18, silent=True)
+ sage: pari.allocatemem(2**18, silent=True)
sage: pari.stacksize()
262144
-@@ -931,6 +931,7 @@
+@@ -949,6 +949,7 @@
stack size::
sage: a = pari('2^100000000')
@@ -31,26 +31,26 @@ 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
-@@ -946,7 +947,7 @@
+@@ -964,7 +965,7 @@
sage: a = pari('2^100000000')
Traceback (most recent call last):
...
-- PariError: _^s: the PARI stack overflows (current size: 4194304; maximum size: 4194304)
+- 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:
-@@ -957,6 +958,7 @@
- sage: pari.allocatemem(1, 2^26)
+@@ -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
+ sage: a = pari(2)**100000000
+ *** Warning: increasing stack size to...
- sage: pari.stacksize()
- 16777216
+ 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
-@@ -1449,6 +1449,7 @@
+@@ -1483,6 +1483,7 @@
sage: E.analytic_rank(algorithm='pari')
2
sage: E.analytic_rank(algorithm='rubinstein')
@@ -58,7 +58,7 @@ Author: Tobias Hansen <thansen at debian.org>
2
sage: E.analytic_rank(algorithm='sympow')
2
-@@ -1457,6 +1458,7 @@
+@@ -1491,6 +1492,7 @@
sage: E.analytic_rank(algorithm='zero_sum')
2
sage: E.analytic_rank(algorithm='all')
@@ -78,7 +78,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
-@@ -2394,6 +2394,7 @@
+@@ -2444,6 +2444,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
@@ -88,7 +88,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
-@@ -4687,6 +4687,7 @@
+@@ -4689,6 +4689,7 @@
sage: H = heegner_points(11).reduce_mod(3)
sage: R = H.left_orders()[0]
sage: H.optimal_embeddings(-7, 1, R)
@@ -98,7 +98,7 @@ Author: Tobias Hansen <thansen at debian.org>
sage: H.optimal_embeddings(-7, 2, R)
--- a/sage/src/sage/schemes/elliptic_curves/isogeny_small_degree.py
+++ b/sage/src/sage/schemes/elliptic_curves/isogeny_small_degree.py
-@@ -1910,6 +1910,7 @@
+@@ -1930,6 +1930,7 @@
sage: E = EllipticCurve([-3440, 77658])
sage: isogenies_prime_degree_general(E, 43) # long time (16s)
@@ -128,7 +128,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
-@@ -6518,6 +6518,7 @@
+@@ -6520,6 +6520,7 @@
....: (2^100).binomial(2^22, algorithm='pari')
....: except AlarmInterrupt:
....: pass
@@ -211,33 +211,6 @@ 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/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()
-+ *** Warning: increasing stack size to...
- 2*3 + 3^4 + 2*3^6 + 3^7 + 2*3^8 + 2*3^9 + O(3^10)
- """
-
-@@ -4576,7 +4577,7 @@
-
- sage: pari(8).bernvec()
- doctest:...: DeprecationWarning: bernvec() is deprecated, use repeated calls to bernfrac() instead
-- See http://trac.sagemath.org/15767 for details.
-+ See http://trac.sagemath.org/15767 for details...
- [1, 1/6, -1/30, 1/42, -1/30, 5/66, -691/2730, 7/6, -3617/510]
- sage: [pari(2*n).bernfrac() for n in range(9)]
- [1, 1/6, -1/30, 1/42, -1/30, 5/66, -691/2730, 7/6, -3617/510]
-@@ -4694,6 +4695,7 @@
-
- sage: K.<a> = NumberField(x^3 - 2)
- sage: pari(K)
-+ *** Warning: increasing stack size to...
- [y^3 - 2, [1, 1], -108, 1, [[1, 1.25992104989487, 1.58740105196820; 1, -0.629960524947437 + 1.09112363597172*I, -0.793700525984100 - 1.37472963699860*I], [1, 1.25992104989487, 1.58740105196820; 1, 0.461163111024285, -2.16843016298270; 1, -1.72108416091916, 0.581029111014503], [1, 1, 2; 1, 0, -2; 1, -2, 1], [3, 0, 0; 0, 0, 6; 0, 6, 0], [6, 0, 0; 0, 6, 0; 0, 0, 3], [2, 0, 0; 0, 0, 1; 0, 1, 0], [2, [0, 0, 2; 1, 0, 0; 0, 1, 0]], []], [1.25992104989487, -0.629960524947437 + 1.0911236 [...]
-
- sage: E = EllipticCurve('37a1')
--- a/sage/src/sage/lfunctions/lcalc.py
+++ b/sage/src/sage/lfunctions/lcalc.py
@@ -122,6 +122,7 @@
@@ -277,11 +250,11 @@ Author: Tobias Hansen <thansen at debian.org>
--- 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)
+ 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)
+ sage: x == 2**(2**26)
True
--- a/sage/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/elliptic_curves.rst
@@ -306,7 +279,7 @@ Author: Tobias Hansen <thansen at debian.org>
--- a/sage/src/sage/functions/orthogonal_polys.py
+++ b/sage/src/sage/functions/orthogonal_polys.py
-@@ -1293,6 +1293,7 @@
+@@ -1227,6 +1227,7 @@
sage: legendre_P(4,x)
35/8*x^4 - 15/4*x^2 + 3/8
sage: legendre_P(10000,x).coefficient(x,1)
diff --git a/debian/patches/d0-pari.patch b/debian/patches/d0-pari.patch
index f9e1441..c1ac1cc 100644
--- a/debian/patches/d0-pari.patch
+++ b/debian/patches/d0-pari.patch
@@ -12,13 +12,3 @@
# logfile disabled since Expect already logs
self._eval_line('default(log,0);')
# set random seed
---- 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
-
--cdef extern from "pari/anal.h":
-- char* closure_func_err()
-+#cdef extern from 'pari/anal.h':
-+cdef extern char* closure_func_err()
diff --git a/debian/patches/d0-paths-sharedata.patch b/debian/patches/d0-paths-sharedata.patch
index 2accc47..cf506fd 100644
--- a/debian/patches/d0-paths-sharedata.patch
+++ b/debian/patches/d0-paths-sharedata.patch
@@ -10,7 +10,7 @@ Author: Ximin Luo <infinity0 at debian.org>
Forwarded: TODO
--- a/sage/src/sage/combinat/designs/latin_squares.py
+++ b/sage/src/sage/combinat/designs/latin_squares.py
-@@ -544,8 +544,7 @@
+@@ -547,8 +547,7 @@
return
if compare:
diff --git a/debian/patches/d0-paths.patch b/debian/patches/d0-paths.patch
index 0f29054..a107694 100644
--- a/debian/patches/d0-paths.patch
+++ b/debian/patches/d0-paths.patch
@@ -6,9 +6,9 @@ Forwarded: not-needed
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sage/src/sage/interfaces/gap.py
+++ b/sage/src/sage/interfaces/gap.py
-@@ -194,7 +194,7 @@
+@@ -193,7 +193,7 @@
- WORKSPACE = os.path.join(GAP_DIR, 'workspace-%s'%abs(hash(SAGE_LOCAL)))
+ WORKSPACE = gap_workspace_file()
-GAP_BINARY = os.path.join(SAGE_LOCAL, 'bin', 'gap')
+GAP_BINARY = '/usr/bin/gap'
@@ -50,7 +50,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
sage: from sage.interfaces.qepcad import _qepcad_atoms
--- a/sage/src/sage/tests/cmdline.py
+++ b/sage/src/sage/tests/cmdline.py
-@@ -560,12 +560,6 @@
+@@ -561,12 +561,6 @@
sage: ret
0
diff --git a/debian/patches/u1-fix-dont-require-DISPLAY.patch b/debian/patches/u1-fix-dont-require-DISPLAY.patch
index 57d0cb2..80c7cf2 100644
--- a/debian/patches/u1-fix-dont-require-DISPLAY.patch
+++ b/debian/patches/u1-fix-dont-require-DISPLAY.patch
@@ -14,13 +14,13 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
sage: plot(x^2, (x,0,5))
Graphics object consisting of 1 graphics primitive
---- a/sage/src/sage/gsl/probability_distribution.pyx
-+++ b/sage/src/sage/gsl/probability_distribution.pyx
-@@ -113,6 +113,7 @@
+--- a/sage/src/sage/probability/probability_distribution.pyx
++++ b/sage/src/sage/probability/probability_distribution.pyx
+@@ -112,6 +112,7 @@
- EXAMPLE::
+ EXAMPLES::
+ sage: import matplotlib; matplotlib.use('Agg')
- sage: from sage.gsl.probability_distribution import GeneralDiscreteDistribution
+ sage: from sage.probability.probability_distribution import GeneralDiscreteDistribution
sage: P = [0.3, 0.4, 0.3]
sage: X = GeneralDiscreteDistribution(P)
diff --git a/debian/patches/u1-looser-doctest-basename.patch b/debian/patches/u1-looser-doctest-basename.patch
index 75c4889..3485a09 100644
--- a/debian/patches/u1-looser-doctest-basename.patch
+++ b/debian/patches/u1-looser-doctest-basename.patch
@@ -7,7 +7,7 @@ Forwarded: https://trac.sagemath.org/ticket/22445
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sage/src/sage/doctest/sources.py
+++ b/sage/src/sage/doctest/sources.py
-@@ -84,8 +84,8 @@
+@@ -85,8 +85,8 @@
root = os.path.dirname(path)
# If the file is in the sage library, we can use our knowledge of
# the directory structure
diff --git a/debian/patches/u2-fix-less-trivial-test-cases.patch b/debian/patches/u2-fix-less-trivial-test-cases.patch
index 1f48301..6e5d155 100644
--- a/debian/patches/u2-fix-less-trivial-test-cases.patch
+++ b/debian/patches/u2-fix-less-trivial-test-cases.patch
@@ -39,7 +39,7 @@ to reduce the noise in our test results.
numerical integration::
--- a/sage/src/sage/rings/integer.pyx
+++ b/sage/src/sage/rings/integer.pyx
-@@ -6070,8 +6070,7 @@
+@@ -6072,8 +6072,7 @@
sage: 1 << (2^60)
Traceback (most recent call last):
...
@@ -51,7 +51,7 @@ to reduce the noise in our test results.
--- a/sage/src/sage/numerical/optimize.py
+++ b/sage/src/sage/numerical/optimize.py
-@@ -278,7 +278,7 @@
+@@ -279,7 +279,7 @@
sage: vars=var('x y z')
sage: f=100*(y-x^2)^2+(1-x)^2+100*(z-y^2)^2+(1-y)^2
sage: minimize(f,[.1,.3,.4],disp=0)
@@ -60,16 +60,16 @@ to reduce the noise in our test results.
sage: minimize(f,[.1,.3,.4],algorithm="ncg",disp=0)
(0.9999999..., 0.999999..., 0.999999...)
-@@ -307,7 +307,7 @@
- ... der[-1] = 200r*(x[-1r]-x[-2r]**2r)
- ... return der
+@@ -308,7 +308,7 @@
+ ....: der[-1] = 200r*(x[-1r]-x[-2r]**2r)
+ ....: return der
sage: minimize(rosen,[.1,.3,.4],gradient=rosen_der,algorithm="bfgs",disp=0)
- (1.00..., 1.00..., 1.00...)
+ (0.9999999..., 0.999999..., 0.999999...)
"""
from sage.symbolic.expression import Expression
from sage.ext.fast_eval import fast_callable
-@@ -519,7 +519,7 @@
+@@ -529,7 +529,7 @@
GLPK Simplex Optimizer...
OPTIMAL LP SOLUTION FOUND
sage: sol['x']
diff --git a/debian/patches/u2-fix-trivial-test-cases.patch b/debian/patches/u2-fix-trivial-test-cases.patch
index 839aee4..a29ed27 100644
--- a/debian/patches/u2-fix-trivial-test-cases.patch
+++ b/debian/patches/u2-fix-trivial-test-cases.patch
@@ -81,7 +81,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
sage: rc is None
--- a/sage/src/sage/interfaces/interface.py
+++ b/sage/src/sage/interfaces/interface.py
-@@ -522,9 +522,9 @@
+@@ -523,9 +523,9 @@
EXAMPLES::
sage: maxima.quad_qags(x, x, 0, 1, epsrel=1e-4)
diff --git a/debian/patches/u2-reproducible-docs.patch b/debian/patches/u2-reproducible-docs.patch
index 8c3b8d9..cd6024a 100644
--- a/debian/patches/u2-reproducible-docs.patch
+++ b/debian/patches/u2-reproducible-docs.patch
@@ -7,7 +7,7 @@ Forwarded: TODO
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sage/src/doc/common/conf.py
+++ b/sage/src/doc/common/conf.py
-@@ -54,7 +54,7 @@
+@@ -55,7 +55,7 @@
# General information about the project.
project = u""
diff --git a/debian/patches/u2-scripts-dir.patch b/debian/patches/u2-scripts-dir.patch
index d3e2f9f..1e3cd2a 100644
--- a/debian/patches/u2-scripts-dir.patch
+++ b/debian/patches/u2-scripts-dir.patch
@@ -15,7 +15,7 @@ Forwarded: TODO
--- a/sage/src/bin/sage
+++ b/sage/src/bin/sage
-@@ -432,13 +432,13 @@
+@@ -452,13 +452,13 @@
#####################################################################
if [ "$1" = '-dumpversion' -o "$1" = '--dumpversion' ]; then
@@ -31,7 +31,7 @@ Forwarded: TODO
echo "SageMath version ${SAGE_VERSION}, Release Date: ${SAGE_RELEASE_DATE}"
exit 0
fi
-@@ -943,14 +943,14 @@
+@@ -968,14 +968,14 @@
shift
sage_setup
if [ "$SAGE_DEBUG" = "no" ]; then
@@ -159,7 +159,7 @@ Forwarded: TODO
or a DocTestDefaults object (possibly with some entries modified)
- args -- a list of filenames to doctest
-@@ -950,9 +950,9 @@
+@@ -954,9 +954,9 @@
sage: from sage.doctest.control import DocTestDefaults, DocTestController
sage: DC = DocTestController(DocTestDefaults(timeout=123), ["hello_world.py"])
sage: print(DC._assemble_cmd())
@@ -171,7 +171,7 @@ Forwarded: TODO
opt = dict_difference(self.options.__dict__, DocTestDefaults().__dict__)
for o in ("all", "sagenb"):
if o in opt:
-@@ -986,14 +986,14 @@
+@@ -990,14 +990,14 @@
sage: DD = DocTestDefaults(gdb=True)
sage: DC = DocTestController(DD, ["hello_world.py"])
sage: DC.run_val_gdb(testing=True)
diff --git a/debian/patches/u2-version-cddlib-094h.patch b/debian/patches/u2-version-cddlib-094h.patch
index ceae184..06a2a64 100644
--- a/debian/patches/u2-version-cddlib-094h.patch
+++ b/debian/patches/u2-version-cddlib-094h.patch
@@ -5,7 +5,7 @@ Forwarded: TODO
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sage/src/sage/geometry/polyhedron/backend_cdd.py
+++ b/sage/src/sage/geometry/polyhedron/backend_cdd.py
-@@ -288,7 +288,9 @@
+@@ -286,7 +286,9 @@
else:
n_cdd=n;
self._V_adjacency_matrix = matrix(ZZ, n, n, 0)
@@ -16,7 +16,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
l = cddout.pop(0).split()
assert int(l[0]) == n_cdd, "Not enough V-adjacencies in cdd output?"
for i in range(n_cdd):
-@@ -311,7 +313,9 @@
+@@ -309,7 +311,9 @@
if find_in_cddout('Facet graph'):
n = len(self._Hrepresentation);
self._H_adjacency_matrix = matrix(ZZ, n, n, 0)
--
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