[sagemath] 01/01: Depend on pynac 0.7.8 and add upstream patch for pynac 0.7.7 vs 0.7.8.
Tobias Hansen
thansen at moszumanska.debian.org
Thu Jun 15 10:02:29 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 b627bd51bc92bcf891bea8ee5b148c96fbb3f7b4
Author: Tobias Hansen <thansen at debian.org>
Date: Thu Jun 15 10:39:05 2017 +0100
Depend on pynac 0.7.8 and add upstream patch for pynac 0.7.7 vs 0.7.8.
---
debian/changelog | 2 +
debian/control.in | 2 +-
debian/patches/series | 1 +
debian/patches/u0-version-pynac-0.7.8.patch | 238 ++++++++++++++++++++++++++++
4 files changed, 242 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 4543438..96c75a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ sagemath (8.0~beta10-1) UNRELEASED; urgency=medium
- d0-singular.patch
- d1-install-paths.patch
- d1-sage-env.patch
+ * New patches:
+ - u0-version-pynac-0.7.8.patch
-- Tobias Hansen <thansen at debian.org> Thu, 08 Jun 2017 21:19:49 +0000
diff --git a/debian/control.in b/debian/control.in
index 43ec6c7..cd33eb6 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -63,7 +63,7 @@ Build-Depends:
libplanarity-dev,
libpng-dev,
libppl-dev (>= 1:1.1),
- libpynac-dev (>= 0.7.5),
+ libpynac-dev (>= 0.7.8),
libratpoints-dev,
libreadline-dev,
librw-dev,
diff --git a/debian/patches/series b/debian/patches/series
index 7514e3f..763cf0d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
# 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
u1-version-pbori-boost1.62-hashes.patch #22243
diff --git a/debian/patches/u0-version-pynac-0.7.8.patch b/debian/patches/u0-version-pynac-0.7.8.patch
new file mode 100644
index 0000000..d3500ac
--- /dev/null
+++ b/debian/patches/u0-version-pynac-0.7.8.patch
@@ -0,0 +1,238 @@
+From 31340eabeb342b4411f612fd5f3dd5702a1898e3 Mon Sep 17 00:00:00 2001
+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(-)
+
+--- a/sage/src/sage/symbolic/expression.pyx
++++ b/sage/src/sage/symbolic/expression.pyx
+@@ -114,7 +114,9 @@
+
+ Test if :trac:`9947` is fixed::
+
+- sage: real_part(1+2*(sqrt(2)+1)*(sqrt(2)-1))
++ sage: r=real_part(1+2*(sqrt(2)+1)*(sqrt(2)-1)); r
++ 2*(sqrt(2) + 1)*(sqrt(2) - 1) + 1
++ sage: r.expand()
+ 3
+ sage: a=(sqrt(4*(sqrt(3) - 5)*(sqrt(3) + 5) + 48) + 4*sqrt(3))/ (sqrt(3) + 5)
+ sage: a.real_part()
+@@ -1224,7 +1226,7 @@
+ sage: f._convert({'parent':RDF})
+ -1.40006081533995
+ sage: f._convert({'parent':float})
+- -1.40006081533995
++ -1.4000608153399503
+
+ There is nothing to convert for variables::
+
+@@ -1238,7 +1240,7 @@
+ sage: t = log(10); t
+ log(10)
+ sage: t._convert({'parent':ZZ})
+- 2.30258509299405
++ log(10)
+
+ ::
+
+@@ -1251,8 +1253,10 @@
+
+ sage: f = sqrt(2) * cos(3); f
+ sqrt(2)*cos(3)
++ sage: (sqrt(2))._convert({'parent':int})
++ sqrt(2)
+ sage: f._convert({'parent':int})
+- -0.989992496600445*sqrt(2)
++ 0
+ """
+ cdef GEx res = self._gobj.evalf(0, kwds)
+ return new_Expression_from_GEx(self._parent, res)
+@@ -1845,7 +1849,7 @@
+
+ sage: f = x+2 > sqrt(3)
+ sage: f._maxima_init_assume_()
+- '((_SAGE_VAR_x)+(2))>((3/1)^(1/2))'
++ '((_SAGE_VAR_x)+(2))>((3)^(1/2))'
+ """
+ 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