[sagemath] 02/02: Refresh patches for 8.0.beta11.
Tobias Hansen
thansen at moszumanska.debian.org
Fri Jun 16 19:44:49 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 c1dd375b743be55bbcd261b206066f646a342b80
Author: Tobias Hansen <thansen at debian.org>
Date: Fri Jun 16 19:44:32 2017 +0000
Refresh patches for 8.0.beta11.
---
debian/patches/d0-libgap-sage.patch | 6 +-
debian/patches/d0-pari-stackwarn.patch | 2 +-
debian/patches/d1-install-paths.patch | 2 +-
debian/patches/series | 2 +-
debian/patches/u0-version-pynac-0.7.8.patch | 179 +---------------------------
5 files changed, 7 insertions(+), 184 deletions(-)
diff --git a/debian/patches/d0-libgap-sage.patch b/debian/patches/d0-libgap-sage.patch
index 0bd5495..f6cd720 100644
--- a/debian/patches/d0-libgap-sage.patch
+++ b/debian/patches/d0-libgap-sage.patch
@@ -54,9 +54,9 @@ Forwarded: not-needed
+ "zn_poly",
+] + libgap_libs + gd_libs + png_libs + [
"m", "readline", "Lfunction" ,
- ] + cblas_libs + [
- "cryptominisat",
-@@ -645,15 +649,15 @@
+ ] + cblas_libs + zlib_libs
+
+@@ -643,15 +647,15 @@
Extension('sage.libs.gap.util',
sources = ["sage/libs/gap/util.pyx"],
diff --git a/debian/patches/d0-pari-stackwarn.patch b/debian/patches/d0-pari-stackwarn.patch
index 9924413..2747ebc 100644
--- a/debian/patches/d0-pari-stackwarn.patch
+++ b/debian/patches/d0-pari-stackwarn.patch
@@ -23,7 +23,7 @@ Author: Tobias Hansen <thansen at debian.org>
With the optional parameter leading_coefficient set to ``True``, a
--- a/sage/src/sage/schemes/hyperelliptic_curves/hyperelliptic_finite_field.py
+++ b/sage/src/sage/schemes/hyperelliptic_curves/hyperelliptic_finite_field.py
-@@ -445,6 +445,7 @@
+@@ -447,6 +447,7 @@
sage: R.<t> = PolynomialRing(K)
sage: H = HyperellipticCurve(t^7 + 487*t^5 + 9*t + 1)
sage: H.frobenius_polynomial_pari()
diff --git a/debian/patches/d1-install-paths.patch b/debian/patches/d1-install-paths.patch
index 866c85f..da9e0b1 100644
--- a/debian/patches/d1-install-paths.patch
+++ b/debian/patches/d1-install-paths.patch
@@ -23,7 +23,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
from sage.misc.sageinspect import loadable_module_extension
--- a/sage/src/setup.py
+++ b/sage/src/setup.py
-@@ -185,9 +185,9 @@
+@@ -191,9 +191,9 @@
# (that are likely to change on an upgrade) here:
# [At least at the moment. Make sure the headers aren't copied with "-p",
# or explicitly touch them in the respective spkg's spkg-install.]
diff --git a/debian/patches/series b/debian/patches/series
index 763cf0d..3178734 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,8 @@
# Patches already applied upstream or committed in a side branch
# Or nearly-finished patches that they'll very probably merge.
-u0-version-pynac-0.7.8.patch #23134
# Patches that have open upstream tickets
+u0-version-pynac-0.7.8.patch
u1-version-pbori-boost1.62-hashes.patch #22243
u1-fix-use-lexists-not-exists.patch #22438
u1-fix-dont-require-DISPLAY.patch #22441
diff --git a/debian/patches/u0-version-pynac-0.7.8.patch b/debian/patches/u0-version-pynac-0.7.8.patch
index d3500ac..5393592 100644
--- a/debian/patches/u0-version-pynac-0.7.8.patch
+++ b/debian/patches/u0-version-pynac-0.7.8.patch
@@ -3,16 +3,6 @@ From: Ralf Stephan <ralf at ark.in-berlin.de>
Date: Sat, 3 Jun 2017 10:24:04 +0200
Subject: 23134: doctest fixes
-From 7f69a644107405f1ade9b74d50118a04afac8826 Mon Sep 17 00:00:00 2001
-From: Ralf Stephan <ralf at ark.in-berlin.de>
-Date: Mon, 12 Jun 2017 09:44:39 +0200
-Subject: 23199: missing sig_on/off in symbolic arithmetics
-
-From af5ef8bcee04b138ca4d3dce279e8149fbb4e999 Mon Sep 17 00:00:00 2001
-From: Ralf Stephan <ralf at ark.in-berlin.de>
-Date: Mon, 12 Jun 2017 15:17:35 +0200
-Subject: 23199: fix previous commit
-
---
src/sage/symbolic/expression.pyx | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
@@ -60,7 +50,7 @@ Subject: 23199: fix previous commit
"""
cdef GEx res = self._gobj.evalf(0, kwds)
return new_Expression_from_GEx(self._parent, res)
-@@ -1845,7 +1849,7 @@
+@@ -1843,7 +1847,7 @@
sage: f = x+2 > sqrt(3)
sage: f._maxima_init_assume_()
@@ -69,170 +59,3 @@ Subject: 23199: fix previous commit
"""
from sage.calculus.calculus import maxima
-@@ -2626,8 +2630,11 @@
- # constants are wrappers around Sage objects, compare directly
- if is_a_constant(self._gobj.lhs()) and is_a_constant(self._gobj.rhs()):
- return self.operator()(self.lhs().pyobject(), self.rhs().pyobject())
--
-- pynac_result = decide_relational(self._gobj)
-+ sig_on()
-+ try:
-+ pynac_result = decide_relational(self._gobj)
-+ finally:
-+ sig_off()
- if pynac_result == relational_undecidable:
- raise ValueError('undecidable relation: ' + repr(self))
-
-@@ -3014,23 +3021,27 @@
- cdef GEx x
- cdef Expression _right = <Expression>right
- cdef operators op
-- if is_a_relational(left._gobj):
-- if is_a_relational(_right._gobj):
-- op = compatible_relation(relational_operator(left._gobj),
-- relational_operator(_right._gobj))
-- x = relational(left._gobj.lhs() + _right._gobj.lhs(),
-- left._gobj.rhs() + _right._gobj.rhs(),
-- op)
-+ sig_on()
-+ try:
-+ if is_a_relational(left._gobj):
-+ if is_a_relational(_right._gobj):
-+ op = compatible_relation(relational_operator(left._gobj),
-+ relational_operator(_right._gobj))
-+ x = relational(left._gobj.lhs() + _right._gobj.lhs(),
-+ left._gobj.rhs() + _right._gobj.rhs(),
-+ op)
-+ else:
-+ x = relational(left._gobj.lhs() + _right._gobj,
-+ left._gobj.rhs() + _right._gobj,
-+ relational_operator(left._gobj))
-+ elif is_a_relational(_right._gobj):
-+ x = relational(left._gobj + _right._gobj.lhs(),
-+ left._gobj + _right._gobj.rhs(),
-+ relational_operator(_right._gobj))
- else:
-- x = relational(left._gobj.lhs() + _right._gobj,
-- left._gobj.rhs() + _right._gobj,
-- relational_operator(left._gobj))
-- elif is_a_relational(_right._gobj):
-- x = relational(left._gobj + _right._gobj.lhs(),
-- left._gobj + _right._gobj.rhs(),
-- relational_operator(_right._gobj))
-- else:
-- x = left._gobj + _right._gobj
-+ x = left._gobj + _right._gobj
-+ finally:
-+ sig_off()
- return new_Expression_from_GEx(left._parent, x)
-
- cpdef _sub_(left, right):
-@@ -3066,23 +3077,27 @@
- """
- cdef GEx x
- cdef Expression _right = <Expression>right
-- if is_a_relational(left._gobj):
-- if is_a_relational(_right._gobj):
-- op = compatible_relation(relational_operator(left._gobj),
-- relational_operator(_right._gobj))
-- x = relational(left._gobj.lhs() - _right._gobj.lhs(),
-- left._gobj.rhs() - _right._gobj.rhs(),
-- op)
-+ sig_on()
-+ try:
-+ if is_a_relational(left._gobj):
-+ if is_a_relational(_right._gobj):
-+ op = compatible_relation(relational_operator(left._gobj),
-+ relational_operator(_right._gobj))
-+ x = relational(left._gobj.lhs() - _right._gobj.lhs(),
-+ left._gobj.rhs() - _right._gobj.rhs(),
-+ op)
-+ else:
-+ x = relational(left._gobj.lhs() - _right._gobj,
-+ left._gobj.rhs() - _right._gobj,
-+ relational_operator(left._gobj))
-+ elif is_a_relational(_right._gobj):
-+ x = relational(left._gobj - _right._gobj.lhs(),
-+ left._gobj - _right._gobj.rhs(),
-+ relational_operator(_right._gobj))
- else:
-- x = relational(left._gobj.lhs() - _right._gobj,
-- left._gobj.rhs() - _right._gobj,
-- relational_operator(left._gobj))
-- elif is_a_relational(_right._gobj):
-- x = relational(left._gobj - _right._gobj.lhs(),
-- left._gobj - _right._gobj.rhs(),
-- relational_operator(_right._gobj))
-- else:
-- x = left._gobj - _right._gobj
-+ x = left._gobj - _right._gobj
-+ finally:
-+ sig_off()
- return new_Expression_from_GEx(left._parent, x)
-
- cpdef _mul_(left, right):
-@@ -3297,25 +3312,29 @@
- cdef GEx x
- cdef Expression _right = <Expression>right
- cdef operators o
-- if is_a_relational(left._gobj):
-- if is_a_relational(_right._gobj):
-- op = compatible_relation(relational_operator(left._gobj),
-- relational_operator(_right._gobj))
-- x = relational(left._gobj.lhs() * _right._gobj.lhs(),
-- left._gobj.rhs() * _right._gobj.rhs(),
-- op)
-- else:
-- o = relational_operator(left._gobj)
-- x = relational(left._gobj.lhs() * _right._gobj,
-- left._gobj.rhs() * _right._gobj,
-+ sig_on()
-+ try:
-+ if is_a_relational(left._gobj):
-+ if is_a_relational(_right._gobj):
-+ op = compatible_relation(relational_operator(left._gobj),
-+ relational_operator(_right._gobj))
-+ x = relational(left._gobj.lhs() * _right._gobj.lhs(),
-+ left._gobj.rhs() * _right._gobj.rhs(),
-+ op)
-+ else:
-+ o = relational_operator(left._gobj)
-+ x = relational(left._gobj.lhs() * _right._gobj,
-+ left._gobj.rhs() * _right._gobj,
-+ o)
-+ elif is_a_relational(_right._gobj):
-+ o = relational_operator(_right._gobj)
-+ x = relational(left._gobj * _right._gobj.lhs(),
-+ left._gobj * _right._gobj.rhs(),
- o)
-- elif is_a_relational(_right._gobj):
-- o = relational_operator(_right._gobj)
-- x = relational(left._gobj * _right._gobj.lhs(),
-- left._gobj * _right._gobj.rhs(),
-- o)
-- else:
-- x = left._gobj * _right._gobj
-+ else:
-+ x = left._gobj * _right._gobj
-+ finally:
-+ sig_off()
- return new_Expression_from_GEx(left._parent, x)
-
- cpdef _div_(left, right):
-@@ -3399,6 +3418,7 @@
- cdef GEx x
- cdef Expression _right = <Expression>right
- cdef operators o
-+ sig_on()
- try:
- if is_a_relational(left._gobj):
- if is_a_relational(_right._gobj):
-@@ -3427,6 +3447,8 @@
- raise ZeroDivisionError("Symbolic division by zero")
- else:
- raise
-+ finally:
-+ sig_off()
-
- def __invert__(self):
- """
--
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