[sagemath] 03/04: Refresh patches (and remove patches for new pynac and numpy versions) for sage 8.1.beta9.

Tobias Hansen thansen at moszumanska.debian.org
Sat Nov 4 09:19:58 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 36d742ba7420bce92ddd91b5e21168b3e9b8d46c
Author: Tobias Hansen <thansen at debian.org>
Date:   Fri Nov 3 22:05:41 2017 +0000

    Refresh patches (and remove patches for new pynac and numpy versions) for sage 8.1.beta9.
---
 debian/changelog                                   |   6 +-
 debian/patches/d0-arb.patch                        |   2 +-
 debian/patches/d0-libgap-sage.patch                |   2 +-
 debian/patches/d0-nauty.patch                      |   4 +-
 debian/patches/d1-sage-cli.patch                   |   6 +-
 debian/patches/series                              |   2 -
 debian/patches/u0-version-numpy-1.13.patch         | 113 ------
 debian/patches/u0-version-pynac-0.7.12.patch       | 426 ---------------------
 debian/patches/u1-scripts-dir.patch                |   4 +-
 .../u1-version-pbori-boost1.62-hashes.patch        |   4 +-
 .../patches/u2-fix-less-trivial-test-cases.patch   |  14 -
 11 files changed, 13 insertions(+), 570 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a1c8665..757d0c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,10 +13,8 @@ sagemath (8.1~beta9-1) UNRELEASED; urgency=medium
     - (libgd2-noxpm-dev | libgd2-xpm-dev) to libgd-dev
   * New patches:
     - d0-pari-2.9-revert-23544.patch
-
-  [ Ximin Luo ]
-  * New patches:
-    - u0-version-numpy-1.13.patch
+  * Remove patches:
+    - u0-version-pynac-0.7.12.patch
 
  -- Gianfranco Costamagna <locutusofborg at debian.org>  Mon, 16 Oct 2017 20:14:41 +0200
 
diff --git a/debian/patches/d0-arb.patch b/debian/patches/d0-arb.patch
index cb6c008..9b640e0 100644
--- a/debian/patches/d0-arb.patch
+++ b/debian/patches/d0-arb.patch
@@ -15,7 +15,7 @@ Forwarded: not-needed
      "brial",
      "brial_groebner",
      "m4rie",
-@@ -777,7 +777,7 @@
+@@ -772,7 +772,7 @@
  
      Extension("sage.matrix.matrix_complex_ball_dense",
                ["sage/matrix/matrix_complex_ball_dense.pyx"],
diff --git a/debian/patches/d0-libgap-sage.patch b/debian/patches/d0-libgap-sage.patch
index 014a4cb..bdb7a30 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 + zlib_libs
  
-@@ -615,15 +619,15 @@
+@@ -610,15 +614,15 @@
  
      Extension('sage.libs.gap.util',
                sources = ["sage/libs/gap/util.pyx"],
diff --git a/debian/patches/d0-nauty.patch b/debian/patches/d0-nauty.patch
index 9d77dda..9fa0caf 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
-@@ -880,10 +880,10 @@
+@@ -881,10 +881,10 @@
  
              sage: gen = graphs.nauty_geng("4", debug=True)
              sage: print(next(gen))
@@ -15,7 +15,7 @@
          if debug:
 --- a/sage/src/sage/graphs/digraph_generators.py
 +++ b/sage/src/sage/graphs/digraph_generators.py
-@@ -484,7 +484,7 @@
+@@ -548,7 +548,7 @@
  
          nauty_input +=  " "+str(n) +" "
  
diff --git a/debian/patches/d1-sage-cli.patch b/debian/patches/d1-sage-cli.patch
index 62b20ed..7846f64 100644
--- a/debian/patches/d1-sage-cli.patch
+++ b/debian/patches/d1-sage-cli.patch
@@ -395,7 +395,7 @@ Forwarded: not-needed
      shift
      sage-cleaner &>/dev/null &
 @@ -801,34 +563,15 @@
-    exit 0
+     exit 0
  fi
  
 -if [ "$1" = '-b' ]; then
@@ -409,8 +409,8 @@ Forwarded: not-needed
 -fi
 -
  if [ "$1" = '-r' ]; then
-    shift
-    interactive_sage
+     shift
+     interactive_sage
  fi
  
 -if [ "$1" = '-ba' -o "$1" = '-ba-force' -o "$1" = '--ba-force' ]; then
diff --git a/debian/patches/series b/debian/patches/series
index b832657..ef07699 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
 # 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.12.patch              #23950
-u0-version-numpy-1.13.patch                #24063
 
 # Patches that have open upstream tickets
 u1-version-pbori-boost1.62-hashes.patch    #22243
diff --git a/debian/patches/u0-version-numpy-1.13.patch b/debian/patches/u0-version-numpy-1.13.patch
deleted file mode 100644
index 423eef7..0000000
--- a/debian/patches/u0-version-numpy-1.13.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 3a5b70d9bc38575e2d77ab8a4f73d7f53b31d1bc Mon Sep 17 00:00:00 2001
-From: Jeroen Demeyer <jdemeyer at cage.ugent.be>
-Date: Wed, 18 Oct 2017 14:49:22 +0200
-Subject: Don't use NumPy functions on Sage Elements
-
----
- src/sage/matrix/matrix_double_dense.pyx | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-From bfb8061c316a0fc30ebd1730073f0cacf5d77539 Mon Sep 17 00:00:00 2001
-From: Jeroen Demeyer <jdemeyer at cage.ugent.be>
-Date: Wed, 18 Oct 2017 15:22:20 +0200
-Subject: Silence warnings from old matplotlib + new numpy
-
----
- src/sage/all.py | 18 +++++++++++-------
- 1 file changed, 11 insertions(+), 7 deletions(-)
-
---- a/sage/src/sage/matrix/matrix_double_dense.pyx
-+++ b/sage/src/sage/matrix/matrix_double_dense.pyx
-@@ -2567,7 +2567,7 @@
-             unitary = T._is_lower_triangular(tol)
-             if unitary:
-                 for 0 <= i < self._nrows:
--                    if numpy.absolute(numpy.absolute(T.get_unsafe(i,i)) - 1) > tol:
-+                    if abs(abs(T.get_unsafe(i,i)) - 1) > tol:
-                         unitary = False
-                         break
-         elif algorithm == 'naive':
-@@ -2576,11 +2576,11 @@
-             for i from 0 <= i < self._nrows:
-                 # off-diagonal, since P is Hermitian
-                 for j from 0 <= j < i:
--                    if numpy.absolute(P.get_unsafe(i,j)) > tol:
-+                    if abs(P.get_unsafe(i,j)) > tol:
-                         unitary = False
-                         break
-                 # at diagonal
--                if numpy.absolute(P.get_unsafe(i,i)-1) > tol:
-+                if abs(P.get_unsafe(i,i) - 1) > tol:
-                     unitary = False
-                 if not unitary:
-                     break
-@@ -2619,7 +2619,7 @@
-         cdef Py_ssize_t i, j
-         for i in range(self._nrows):
-             for j in range(i+1, self._ncols):
--                if numpy.absolute(self.get_unsafe(i,j)) > tol:
-+                if abs(self.get_unsafe(i,j)) > tol:
-                     return False
-         return True
- 
-@@ -2777,14 +2777,14 @@
-             hermitian = T._is_lower_triangular(tol)
-             if hermitian:
-                 for i in range(T._nrows):
--                    if numpy.absolute(numpy.imag(T.get_unsafe(i,i))) > tol:
-+                    if abs(T.get_unsafe(i,i).imag()) > tol:
-                         hermitian = False
-                         break
-         elif algorithm == 'naive':
-             hermitian = True
-             for i in range(self._nrows):
-                 for j in range(i+1):
--                    if numpy.absolute(self.get_unsafe(i,j) - self.get_unsafe(j,i).conjugate()) > tol:
-+                    if abs(self.get_unsafe(i,j) - self.get_unsafe(j,i).conjugate()) > tol:
-                         hermitian = False
-                         break
-                 if not hermitian:
-@@ -2976,7 +2976,7 @@
-             # two products are Hermitian, need only check lower triangle
-             for i in range(self._nrows):
-                 for j in range(i+1):
--                    if numpy.absolute(left.get_unsafe(i,j) - right.get_unsafe(i,j)) > tol:
-+                    if abs(left.get_unsafe(i,j) - right.get_unsafe(i,j)) > tol:
-                         normal = False
-                         break
-                 if not normal:
---- a/sage/src/sage/all.py
-+++ b/sage/src/sage/all.py
-@@ -310,21 +310,25 @@
-     O.close()
- 
- 
--# Set a new random number seed as the very last thing
--# (so that printing initial_seed() and using that seed
--# in set_random_seed() will result in the same sequence you got at
--# Sage startup).
--set_random_seed()
--
- import warnings
- warnings.filters.remove(('ignore', None, DeprecationWarning, None, 0))
- # Ignore all deprecations from IPython etc.
- warnings.filterwarnings('ignore',
-     module='.*(IPython|ipykernel|jupyter_client|jupyter_core|nbformat|notebook|ipywidgets|storemagic)')
--# but not those that have OUR deprecation warnings
-+# Ignore warnings due to matplotlib-1.5 together with numpy-1.13
-+warnings.filterwarnings('ignore', module='matplotlib[.]contour|numpy[.]ma[.]core')
-+# However, be sure to keep OUR deprecation warnings
- warnings.filterwarnings('default',
-     '[\s\S]*See http://trac.sagemath.org/[0-9]* for details.')
- 
-+
-+# Set a new random number seed as the very last thing
-+# (so that printing initial_seed() and using that seed
-+# in set_random_seed() will result in the same sequence you got at
-+# Sage startup).
-+set_random_seed()
-+
-+
- # From now on it is ok to resolve lazy imports
- sage.misc.lazy_import.finish_startup()
- 
diff --git a/debian/patches/u0-version-pynac-0.7.12.patch b/debian/patches/u0-version-pynac-0.7.12.patch
deleted file mode 100644
index 9fd9055..0000000
--- a/debian/patches/u0-version-pynac-0.7.12.patch
+++ /dev/null
@@ -1,426 +0,0 @@
-Bug: https://trac.sagemath.org/ticket/23950
-
-From 5425450f4025dfb686df5eda75290ade6a0fc42f Mon Sep 17 00:00:00 2001
-From: Ralf Stephan <ralf at ark.in-berlin.de>
-Date: Sun, 1 Oct 2017 15:42:27 +0200
-Subject: 23950: update interface
-
----
-
- src/sage/libs/pynac/pynac.pxd | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-From d8e30d63ddc068a82273235ac85ff85cde016d2f Mon Sep 17 00:00:00 2001
-From: Ralf Stephan <ralf at ark.in-berlin.de>
-Date: Sun, 1 Oct 2017 15:46:21 +0200
-Subject: 23950: changes to symbolics code because of interface changes
-
----
- src/sage/symbolic/expression.pyx | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-From 41b0e2f445a13582cba37868f8fc80d6be1734a0 Mon Sep 17 00:00:00 2001
-From: Ralf Stephan <ralf at ark.in-berlin.de>
-Date: Sun, 1 Oct 2017 16:03:22 +0200
-Subject: 23950: doctest fixes
-
----
- .../de/thematische_anleitungen/sage_gymnasium.rst  |  2 +-
- src/sage/coding/code_bounds.py                     |  4 +--
- src/sage/functions/log.py                          |  8 +++---
- src/sage/functions/orthogonal_polys.py             |  2 +-
- src/sage/rings/asymptotic/asymptotic_ring.py       |  2 +-
- ...symptotics_multivariate_generating_functions.py | 30 ++++++++++++---------
- src/sage/rings/asymptotic/term_monoid.py           |  4 +--
- src/sage/rings/integer.pyx                         |  2 +-
- src/sage/rings/rational.pyx                        |  4 +--
- src/sage/schemes/elliptic_curves/ell_point.py      |  2 +-
- src/sage/symbolic/constants_c.pyx                  |  6 ++---
- src/sage/symbolic/expression.pyx                   | 31 ++++++++++------------
- src/sage/tests/french_book/calculus_doctest.py     |  2 +-
- 13 files changed, 51 insertions(+), 48 deletions(-)
----
---- a/sage/src/sage/libs/pynac/pynac.pxd
-+++ b/sage/src/sage/libs/pynac/pynac.pxd
-@@ -97,6 +97,7 @@
- 
-     cdef cppclass GEx "ex":
-         GEx()
-+        GEx(GNumeric o)
-         GEx(GSymbol m)
-         GEx(GEx m)
-         GEx(long n)
-@@ -127,8 +128,8 @@
-         GEx numer()                   except +
-         GEx denom()                   except +
-         GEx numer_denom()             except +
--        int degree(GEx expr)          except +
--        int ldegree(GEx expr)         except +
-+        GNumeric degree(GEx expr)          except +
-+        GNumeric ldegree(GEx expr)         except +
-         GEx unit(GEx expr)            except +
-         GEx content(GEx expr)         except +
-         GEx primpart(GEx expr)        except +
-@@ -161,6 +162,7 @@
- 
-     # Algorithms
-     GEx g_gcd "gcd"(GEx a, GEx b) except +
-+    bint g_factor "factor"(GEx expr, GEx res) except +
-     GEx g_gosper_term "gosper_term"(GEx the_ex, GEx n) except +
-     GEx g_gosper_sum_definite "gosper_sum_definite"(GEx the_ex,
-             GEx n, GEx a, GEx b, int* p) except +
---- a/sage/src/sage/symbolic/expression.pyx
-+++ b/sage/src/sage/symbolic/expression.pyx
-@@ -3286,11 +3286,8 @@
-             -1
-             sage: b = -x*A; c = b*b; c
-             1/4*x^2*(sqrt(5) + I*sqrt(2*sqrt(5) + 10) - 1)
--
--        Products of non integer powers of exp are not simplified::
--
-             sage: exp(x)^I*exp(z)^(2.5)
--            (e^x)^I*(e^z)^2.50000000000000
-+            e^(I*x + 2.50000000000000*z)
- 
-         ::
- 
-@@ -3347,17 +3344,17 @@
-             sage: ex.substitute(r1=z, r2=z)
-             -(c1 + z*c2 + z)/c3
- 
--        Note the content and the leading coefficient of the numerator after
--        the substitution::
-+        Note the content cannot be computed because of nonsensical
-+        arithmetic::
- 
-             sage: num = ex.op[0].subs({r1: z, r2: z}); num
-             -c1 + z*c2 + z
-             sage: num.leading_coefficient(c1)
-             -1
-             sage: num.content(c1)
--            1
--            sage: num.content(c1).pyobject().parent()
--            Integer Ring
-+            Traceback (most recent call last):
-+            ...
-+            TypeError: unsupported operand parent(s) for *: 'Finite Field in z of size 2^8' and 'Rational Field'
- 
-         The leading coefficient is a negative number. The normalization process
-         tries to convert it to a positive number and extract the content, by
-@@ -3964,7 +3961,7 @@
-             sage: 0^1.0
-             0.000000000000000
-             sage: exp(x)^1.0
--            (e^x)^1.00000000000000
-+            e^(1.00000000000000*x)
- 
-         Check that :trac:`23921` is resolved::
- 
-@@ -6416,7 +6413,7 @@
-         cdef Expression ss = self.coerce_in(s)
-         sig_on()
-         try:
--            return self._gobj.ldegree(ss._gobj)
-+            return new_Expression_from_GEx(self._parent, GEx(self._gobj.ldegree(ss._gobj)))
-         finally:
-             sig_off()
- 
-@@ -6446,7 +6443,7 @@
-         cdef Expression ss = self.coerce_in(s)
-         sig_on()
-         try:
--            return self._gobj.degree(ss._gobj)
-+            return new_Expression_from_GEx(self._parent, GEx(self._gobj.degree(ss._gobj)))
-         finally:
-             sig_off()
- 
-@@ -7318,12 +7315,12 @@
-             sage: f.collect(z)
-             (x^2*y^2 + 4)*z^2 + 4*x*y + 20*y^2 + (x + 21*y)*z
- 
--        Sometimes, we do have to call :meth:`expand()` on the
--        expression first to achieve the desired result::
-+        The terms are collected, whether the expression
-+        is expanded or not::
- 
-             sage: f = (x + y)*(x - z)
-             sage: f.collect(x)
--            x^2 + x*y - x*z - y*z
-+            x^2 + x*(y - z) - y*z
-             sage: f.expand().collect(x)
-             x^2 + x*(y - z) - y*z
- 
-@@ -10597,9 +10594,9 @@
-         ``x*log(9)`` is contracted only if ``algorithm`` is ``'all'``::
- 
-             sage: (x*log(9)).simplify_log()
--            x*log(9)
-+            2*x*log(3)
-             sage: (x*log(9)).simplify_log('all')
--            log(9^x)
-+            log(3^(2*x))
- 
-         TESTS:
- 
-@@ -10714,7 +10711,7 @@
-         To expand also log(3/4) use ``algorithm='all'``::
- 
-             sage: (log(3/4*x^pi)).log_expand('all')
--            pi*log(x) - log(4) + log(3)
-+            pi*log(x) + log(3) - 2*log(2)
- 
-         To expand only the power use ``algorithm='powers'``.::
- 
-@@ -10737,7 +10734,7 @@
-             pi*log(x) + log(3/4)
- 
-             sage: (log(3/4*x^pi)).log_expand('all')
--            pi*log(x) - log(4) + log(3)
-+            pi*log(x) + log(3) - 2*log(2)
- 
-             sage: (log(3/4*x^pi)).log_expand()
-             pi*log(x) + log(3/4)
---- a/sage/src/doc/de/thematische_anleitungen/sage_gymnasium.rst
-+++ b/sage/src/doc/de/thematische_anleitungen/sage_gymnasium.rst
-@@ -716,7 +716,7 @@
- Diese Gesetze können auch umgekehrt verwendet werden, wie in diesem Beispiel::
- 
-     sage: (5*log(2) + 5*log(5)).simplify_log()
--    log(100000)
-+    5*log(10)
- 
- Es geben weitere mögliche Vereinfachungen, die wir hier nicht weiter erwähnen.
- 
---- a/sage/src/sage/coding/code_bounds.py
-+++ b/sage/src/sage/coding/code_bounds.py
-@@ -577,8 +577,8 @@
- 
-         sage: codes.bounds.entropy(0, 2)
-         0
--        sage: codes.bounds.entropy(1/5,4)
--        1/5*log(3)/log(4) - 4/5*log(4/5)/log(4) - 1/5*log(1/5)/log(4)
-+        sage: codes.bounds.entropy(1/5,4).factor()
-+        1/10*(log(3) - 4*log(4/5) - log(1/5))/log(2)
-         sage: codes.bounds.entropy(1, 3)
-         log(2)/log(3)
- 
---- a/sage/src/sage/functions/log.py
-+++ b/sage/src/sage/functions/log.py
-@@ -121,12 +121,12 @@
-             sage: model_exp = exp(II)**a*(b)
-             sage: sol1_l={b: 5.0, a: 1.1}
-             sage: model_exp.subs(sol1_l)
--            5.00000000000000*(e^II)^1.10000000000000
-+            5.00000000000000*e^(1.10000000000000*II)
- 
-         ::
- 
-             sage: exp(3)^II*exp(x)
--            (e^3)^II*e^x
-+            e^(3*II + x)
-             sage: exp(x)*exp(x)
-             e^(2*x)
-             sage: exp(x)*exp(a)
-@@ -137,7 +137,7 @@
-         Another instance of the same problem (:trac:`7394`)::
- 
-             sage: 2*sqrt(e)
--            2*sqrt(e)
-+            2*e^(1/2)
- 
-         Check that :trac:`19918` is fixed::
- 
-@@ -271,7 +271,7 @@
-             sage: RDF(log(1024, 2))
-             10.0
-             sage: log(10, 4)
--            log(10)/log(4)
-+            1/2*log(10)/log(2)
-             sage: RDF(log(10, 4))
-             1.6609640474436813
-             sage: log(10, 2)
---- a/sage/src/sage/functions/orthogonal_polys.py
-+++ b/sage/src/sage/functions/orthogonal_polys.py
-@@ -1666,7 +1666,7 @@
-         EXAMPLES::
- 
-             sage: gen_legendre_Q(2,1,3)
--            -1/4*sqrt(-2)*(-36*I*pi + 36*log(4) - 36*log(2) - 25)
-+            -1/4*sqrt(-2)*(-36*I*pi + 36*log(2) - 25)
-         """
-         ret = self._eval_special_values_(n, m, x)
-         if ret is not None:
---- a/sage/src/sage/rings/asymptotic/asymptotic_ring.py
-+++ b/sage/src/sage/rings/asymptotic/asymptotic_ring.py
-@@ -2485,7 +2485,7 @@
-         ::
- 
-             sage: (x^2 + log(x)).subs(x=4*x+2).truncate(5)
--            16*x^2 + 16*x + log(x) + log(4) + 4 + 1/2*x^(-1) + O(x^(-2))
-+            16*x^2 + 16*x + log(x) + 2*log(2) + 4 + 1/2*x^(-1) + O(x^(-2))
-             sage: _.parent()
-             Asymptotic Ring <(e^x)^QQ * x^ZZ * log(x)^ZZ> over Symbolic Ring
- 
---- a/sage/src/sage/rings/asymptotic/asymptotics_multivariate_generating_functions.py
-+++ b/sage/src/sage/rings/asymptotic/asymptotics_multivariate_generating_functions.py
-@@ -60,9 +60,15 @@
-     sage: decomp = F.asymptotic_decomposition(alpha)
-     sage: decomp
-     (0, []) +
--    (-1/2*(x^2 + 6*x + 9)*r^2/(x^5 + 9*x^4 + 27*x^3 + 27*x^2)
--     - 1/2*(5*x^2 + 24*x + 27)*r/(x^5 + 9*x^4 + 27*x^3 + 27*x^2)
--     - 3*(x^2 + 3*x + 3)/(x^5 + 9*x^4 + 27*x^3 + 27*x^2),
-+    (-1/2*r^2*(x^2/(x^5 + 9*x^4 + 27*x^3 + 27*x^2)
-+     + 6*x/(x^5 + 9*x^4 + 27*x^3 + 27*x^2)
-+     + 9/(x^5 + 9*x^4 + 27*x^3 + 27*x^2))
-+     - 1/2*r*(5*x^2/(x^5 + 9*x^4 + 27*x^3 + 27*x^2)
-+     + 24*x/(x^5 + 9*x^4 + 27*x^3 + 27*x^2)
-+     + 27/(x^5 + 9*x^4 + 27*x^3 + 27*x^2))
-+     - 3*x^2/(x^5 + 9*x^4 + 27*x^3 + 27*x^2)
-+     - 9*x/(x^5 + 9*x^4 + 27*x^3 + 27*x^2)
-+     - 9/(x^5 + 9*x^4 + 27*x^3 + 27*x^2),
-      [(x - 1/2, 1)])
-     sage: F1 = decomp[1]
-     sage: p = {x: 1/2}
-@@ -139,9 +145,9 @@
-     sage: alpha = (var('a'), var('b'))
-     sage: decomp =  F.asymptotic_decomposition(alpha); decomp
-     (0, []) +
--    (-1/9*(2*b^2*x^2 - 5*a*b*x*y + 2*a^2*y^2)*r^2/(x^2*y^2)
--      - 1/9*(6*b*x^2 - 5*(a + b)*x*y + 6*a*y^2)*r/(x^2*y^2)
--      - 1/9*(4*x^2 - 5*x*y + 4*y^2)/(x^2*y^2),
-+    (-1/9*r^2*(2*a^2/x^2 + 2*b^2/y^2 - 5*a*b/(x*y))
-+     - 1/9*r*(6*a/x^2 + 6*b/y^2 - 5*a/(x*y) - 5*b/(x*y))
-+     - 4/9/x^2 - 4/9/y^2 + 5/9/(x*y),
-      [(x + 2*y - 1, 1), (2*x + y - 1, 1)])
-     sage: F1 = decomp[1]
-     sage: F1.asymptotics(p, alpha, 2)
-@@ -1480,9 +1486,9 @@
-             sage: alpha = [var('a')]
-             sage: F.asymptotic_decomposition(alpha)
-             (0, []) +
--            (1/54*(5*a^2*x^2 + 2*a^2*x + 11*a^2)*r^2/x^2
--             - 1/54*(5*a*x^2 - 2*a*x - 33*a)*r/x^2 + 11/27/x^2, [(x - 1, 1)]) +
--            (-5/27, [(x + 2, 1)])
-+            (1/54*(5*a^2 + 2*a^2/x + 11*a^2/x^2)*r^2
-+             - 1/54*(5*a - 2*a/x - 33*a/x^2)*r + 11/27/x^2,
-+            [(x - 1, 1)]) + (-5/27, [(x + 2, 1)])
- 
-         ::
- 
-@@ -1495,7 +1501,7 @@
-             sage: alpha = var('a, b')
-             sage: F.asymptotic_decomposition(alpha)
-             (0, []) +
--            (1/3*(2*b*x - a*y)*r/(x*y) + 1/3*(2*x - y)/(x*y),
-+            (-1/3*r*(a/x - 2*b/y) - 1/3/x + 2/3/y,
-              [(x + 2*y - 1, 1), (2*x + y - 1, 1)])
-         """
-         R = self.denominator_ring
-@@ -1600,7 +1606,7 @@
-             (1, [(x*y + x + y - 1, 2)])
-             sage: alpha = [4, 3]
-             sage: decomp = F.asymptotic_decomposition(alpha); decomp
--            (0, []) + (-3/2*r*(y + 1)/y - 1/2*(y + 1)/y, [(x*y + x + y - 1, 1)])
-+            (0, []) + (-3/2*r*(1/y + 1) - 1/2/y - 1/2, [(x*y + x + y - 1, 1)])
-             sage: F1 = decomp[1]
-             sage: p = {y: 1/3, x: 1/2}
-             sage: asy = F1.asymptotics(p, alpha, 2, verbose=True)
-@@ -1634,7 +1640,7 @@
-             sage: alpha = [3, 3, 2]
-             sage: decomp = F.asymptotic_decomposition(alpha); decomp
-             (0, []) +
--            (16*r*(4*y - 3*z)/(y*z) + 16*(2*y - z)/(y*z),
-+            (-16*r*(3/y - 4/z) - 16/y + 32/z,
-              [(x + 2*y + z - 4, 1), (2*x + y + z - 4, 1)])
-             sage: F1 = decomp[1]
-             sage: p = {x: 1, y: 1, z: 1}
---- a/sage/src/sage/rings/asymptotic/term_monoid.py
-+++ b/sage/src/sage/rings/asymptotic/term_monoid.py
-@@ -3339,7 +3339,7 @@
-             sage: T(x^1234).log_term()
-             (1234*log(x),)
-             sage: T(49*x^7).log_term(base=7)
--            (log(49)/log(7), 7/log(7)*log(x))
-+            (2, 7/log(7)*log(x))
- 
-         ::
- 
-@@ -3347,7 +3347,7 @@
-             sage: T('x * y').log_term()
-             (log(x), log(y))
-             sage: T('4 * x * y').log_term(base=2)
--            (log(4)/log(2), 1/log(2)*log(x), 1/log(2)*log(y))
-+            (2, 1/log(2)*log(x), 1/log(2)*log(y))
- 
-         .. SEEALSO::
- 
---- a/sage/src/sage/rings/integer.pyx
-+++ b/sage/src/sage/rings/integer.pyx
-@@ -2532,7 +2532,7 @@
-             sage: Integer(125).log(5,prec=53)
-             3.00000000000000
-             sage: log(Integer(125))
--            log(125)
-+            3*log(5)
- 
-         For extremely large numbers, this works::
- 
---- a/sage/src/sage/rings/rational.pyx
-+++ b/sage/src/sage/rings/rational.pyx
-@@ -3075,11 +3075,11 @@
-             sage: (124/345).log(5,100)
-             -0.63578895682825611710391773754
-             sage: log(QQ(125))
--            log(125)
-+            3*log(5)
-             sage: log(QQ(125), 5)
-             3
-             sage: log(QQ(125), 3)
--            log(125)/log(3)
-+            3*log(5)/log(3)
-             sage: QQ(8).log(1/2)
-             -3
-             sage: (1/8).log(1/2)
---- a/sage/src/sage/schemes/elliptic_curves/ell_point.py
-+++ b/sage/src/sage/schemes/elliptic_curves/ell_point.py
-@@ -2886,7 +2886,7 @@
-             sage: Q.non_archimedean_local_height(K.ideal(1-2*i))
-             0
-             sage: Q.non_archimedean_local_height()
--            1/2*log(16)
-+            2*log(2)
- 
-         An example over the rational numbers::
- 
---- a/sage/src/sage/symbolic/constants_c.pyx
-+++ b/sage/src/sage/symbolic/constants_c.pyx
-@@ -145,14 +145,14 @@
-             sage: t.operands()
-             [a]
- 
--        As opposed to::
-+        This applies to the unit argument as well::
- 
-             sage: u = SR(1).exp()^a; u
-             e^a
-             sage: u.operator()
--            <built-in function pow>
-+            exp
-             sage: u.operands()
--            [e, a]
-+            [a]
- 
-         It also works with matrices (see :trac:`4735`)::
- 
---- a/sage/src/sage/tests/french_book/calculus_doctest.py
-+++ b/sage/src/sage/tests/french_book/calculus_doctest.py
-@@ -331,7 +331,7 @@
- Sage example in ./calculus.tex, line 929::
- 
-     sage: v(x) = diff(u(x), x); sol = solve(v(x) == 0, x); sol
--    [x == 100/log(100), x == 0]
-+    [x == 50/log(10), x == 0]
-     sage: floor(sol[0].rhs())
-     21
- 
diff --git a/debian/patches/u1-scripts-dir.patch b/debian/patches/u1-scripts-dir.patch
index 73d8e98..33cd9db 100644
--- a/debian/patches/u1-scripts-dir.patch
+++ b/debian/patches/u1-scripts-dir.patch
@@ -159,7 +159,7 @@ Forwarded: TODO
                       or a DocTestDefaults object (possibly with some entries modified)
          - args -- a list of filenames to doctest
  
-@@ -970,9 +970,9 @@
+@@ -971,9 +971,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:
-@@ -1006,14 +1006,14 @@
+@@ -1007,14 +1007,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/u1-version-pbori-boost1.62-hashes.patch b/debian/patches/u1-version-pbori-boost1.62-hashes.patch
index 5bb9e4b..6a513ec 100644
--- a/debian/patches/u1-version-pbori-boost1.62-hashes.patch
+++ b/debian/patches/u1-version-pbori-boost1.62-hashes.patch
@@ -22,7 +22,7 @@ Forwarded: https://trac.sagemath.org/ticket/22243
  
          .. NOTE::
  
-@@ -4653,8 +4653,8 @@
+@@ -4645,8 +4645,8 @@
  
              sage: B.<x,y> = BooleanPolynomialRing()
              sage: x.stable_hash()
@@ -33,7 +33,7 @@ Forwarded: https://trac.sagemath.org/ticket/22243
  
          .. NOTE::
  
-@@ -5748,8 +5748,8 @@
+@@ -5728,8 +5728,8 @@
              sage: B.<x,y> = BooleanPolynomialRing()
              sage: s = x.set()
              sage: s.stable_hash()
diff --git a/debian/patches/u2-fix-less-trivial-test-cases.patch b/debian/patches/u2-fix-less-trivial-test-cases.patch
index d755a3a..b30ab7a 100644
--- a/debian/patches/u2-fix-less-trivial-test-cases.patch
+++ b/debian/patches/u2-fix-less-trivial-test-cases.patch
@@ -4,22 +4,8 @@ Description: Fix some more test cases with less-trivial failures
 Author: Tobias Hansen <thansen at debian.org>
 Forwarded: TODO
 ---
-src/sage/coding/code_bounds.py
-Obviously equivalent expressions
----
 src/sage/functions/orthogonal_polys.py
 Obviously equivalent expressions
---- a/sage/src/sage/coding/code_bounds.py
-+++ b/sage/src/sage/coding/code_bounds.py
-@@ -578,7 +578,7 @@
-         sage: codes.bounds.entropy(0, 2)
-         0
-         sage: codes.bounds.entropy(1/5,4).factor()
--        1/10*(log(3) - 4*log(4/5) - log(1/5))/log(2)
-+        1/10*(log(5) + log(3) - 4*log(4/5))/log(2)
-         sage: codes.bounds.entropy(1, 3)
-         log(2)/log(3)
- 
 --- a/sage/src/sage/functions/orthogonal_polys.py
 +++ b/sage/src/sage/functions/orthogonal_polys.py
 @@ -1888,7 +1888,7 @@

-- 
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