[sagemath] 04/10: Refresh patches (1).
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 ea4654c6ce0aa1f33b16e9e54582d83c326e4a68
Author: Tobias Hansen <thansen at debian.org>
Date: Thu Jun 8 22:02:53 2017 +0000
Refresh patches (1).
---
debian/patches/u1-ipywidgets-repr.patch | 7 ++---
.../patches/u2-fix-less-trivial-test-cases.patch | 34 +++++++++++-----------
debian/patches/u2-fix-trivial-test-cases.patch | 21 ++++---------
3 files changed, 25 insertions(+), 37 deletions(-)
diff --git a/debian/patches/u1-ipywidgets-repr.patch b/debian/patches/u1-ipywidgets-repr.patch
index 14405e3..fa8e591 100644
--- a/debian/patches/u1-ipywidgets-repr.patch
+++ b/debian/patches/u1-ipywidgets-repr.patch
@@ -9,10 +9,10 @@ Bug: https://github.com/jupyter-widgets/ipywidgets/pull/1031
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sage/src/sage/repl/ipython_kernel/widgets.py
+++ b/sage/src/sage/repl/ipython_kernel/widgets.py
-@@ -24,13 +24,43 @@
+@@ -26,13 +26,42 @@
from ipywidgets.widgets import (IntSlider, IntRangeSlider, FloatSlider,
- FloatRangeSlider, Text, Textarea, ColorPicker,
+ FloatRangeSlider, Text, Textarea, ColorPicker, HTML,
- Label, HBox, VBox, ValueWidget)
+ Label, HBox, VBox, ValueWidget, Widget)
from traitlets import List, Unicode, link
@@ -50,7 +50,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ return "%s(%s)" % (type(self).__name__, r)
+Widget.__repr__ = __widgets__repr__
+del __widgets__repr__
-+
- class TransformWidget(object):
+ class HTMLText(HTML):
"""
diff --git a/debian/patches/u2-fix-less-trivial-test-cases.patch b/debian/patches/u2-fix-less-trivial-test-cases.patch
index c89d673..2b2b358 100644
--- a/debian/patches/u2-fix-less-trivial-test-cases.patch
+++ b/debian/patches/u2-fix-less-trivial-test-cases.patch
@@ -35,7 +35,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
-@@ -6072,8 +6072,7 @@
+@@ -6088,8 +6088,7 @@
sage: 1 << (2^60)
Traceback (most recent call last):
...
@@ -47,25 +47,25 @@ to reduce the noise in our test results.
--- a/sage/src/sage/numerical/optimize.py
+++ b/sage/src/sage/numerical/optimize.py
-@@ -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)
+@@ -290,7 +290,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])
- (1.00..., 1.00..., 1.00...)
+ (0.9999999..., 0.999999..., 0.999999...)
- sage: minimize(f,[.1,.3,.4],algorithm="ncg",disp=0)
- (0.9999999..., 0.999999..., 0.999999...)
-@@ -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...)
+ Try the newton-conjugate gradient method; the gradient and hessian are
+ computed automatically::
+@@ -310,7 +310,7 @@
+ sage: def rosen(x): # The Rosenbrock function
+ ....: return sum(100.0r*(x[1r:]-x[:-1r]**2.0r)**2.0r + (1r-x[:-1r])**2.0r)
+ sage: minimize(rosen, [.1,.3,.4])
+- (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
-@@ -529,7 +529,7 @@
+
+ Same example with a pure Python function and a Python function to
+ compute the gradient::
+@@ -551,7 +551,7 @@
GLPK Simplex Optimizer...
OPTIMAL LP SOLUTION FOUND
sage: sol['x']
@@ -76,7 +76,7 @@ to reduce the noise in our test results.
from cvxopt import solvers
--- a/sage/src/sage/coding/code_bounds.py
+++ b/sage/src/sage/coding/code_bounds.py
-@@ -519,7 +519,7 @@
+@@ -627,7 +627,7 @@
sage: from sage.coding.code_bounds import entropy_inverse
sage: entropy_inverse(0.1)
diff --git a/debian/patches/u2-fix-trivial-test-cases.patch b/debian/patches/u2-fix-trivial-test-cases.patch
index 0e42c58..dd39524 100644
--- a/debian/patches/u2-fix-trivial-test-cases.patch
+++ b/debian/patches/u2-fix-trivial-test-cases.patch
@@ -19,7 +19,7 @@ Forwarded: TODO
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sage/src/sage/calculus/calculus.py
+++ b/sage/src/sage/calculus/calculus.py
-@@ -770,7 +770,7 @@
+@@ -767,7 +767,7 @@
Now numerically integrating, we see why the answer is wrong::
sage: f.nintegrate(x,0,1)
@@ -30,7 +30,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
in floating point.
--- a/sage/src/sage/modules/free_module_element.pyx
+++ b/sage/src/sage/modules/free_module_element.pyx
-@@ -3882,11 +3882,11 @@
+@@ -3883,11 +3883,11 @@
sage: type(vec)
<type 'sage.modules.vector_real_double_dense.Vector_real_double_dense'>
sage: answers
@@ -70,7 +70,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
sage: rc is None
--- a/sage/src/sage/misc/cython.py
+++ b/sage/src/sage/misc/cython.py
-@@ -173,14 +173,15 @@
+@@ -211,14 +211,15 @@
'm',
'ec',
'gsl',
@@ -89,7 +89,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
'c',
[], ['-w', '-O2'],...)
sage: s, libs, inc, lang, f, args, libdirs = pyx_preparse("# clang c++\n #clib foo\n # cinclude bar\n")
-@@ -195,7 +196,7 @@
+@@ -233,7 +234,7 @@
'm',
'ec',
'gsl',
@@ -98,7 +98,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
'ntl']
sage: libs[1:] == sage.misc.cython.standard_libs
True
-@@ -205,9 +206,10 @@
+@@ -243,9 +244,10 @@
'.../include',
'.../include/python...',
'.../python.../numpy/core/include',
@@ -123,14 +123,3 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"""
r = os.popen('tachyon').read()
if use_pager == True:
---- a/sage/src/sage/tests/gap_packages.py
-+++ b/sage/src/sage/tests/gap_packages.py
-@@ -102,7 +102,7 @@
-
- sage: from sage.tests.gap_packages import all_installed_packages
- sage: all_installed_packages()
-- (...'GAPDoc',...)
-+ (...'GAPDoc'...)
- """
- packages = []
- for path in libgap.eval('GAP_ROOT_PATHS').sage():
--
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