[python-dtcwt] 03/07: Update patch queue: - Refresh use-system-mathjax.patch and reproducible-build.patch. - Drop Fix-usage-of-unsafe-inplace-casting.patch, applied upstream. - Drop Use-explicit-integer-division.patch, applied upstream.

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/master
in repository python-dtcwt.

commit 451e14a755b741eea882afc914eba1d59a4b2755
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed Mar 9 11:40:40 2016 +0000

    Update patch queue:
    - Refresh use-system-mathjax.patch and reproducible-build.patch.
    - Drop Fix-usage-of-unsafe-inplace-casting.patch, applied upstream.
    - Drop Use-explicit-integer-division.patch, applied upstream.
---
 .../Fix-usage-of-unsafe-inplace-casting.patch      | 23 ------------------
 debian/patches/Use-explicit-integer-division.patch | 27 ----------------------
 debian/patches/reproducible-build.patch            |  6 ++---
 debian/patches/series                              |  2 --
 debian/patches/use-system-mathjax.patch            |  2 +-
 5 files changed, 4 insertions(+), 56 deletions(-)

diff --git a/debian/patches/Fix-usage-of-unsafe-inplace-casting.patch b/debian/patches/Fix-usage-of-unsafe-inplace-casting.patch
deleted file mode 100644
index a24ed69..0000000
--- a/debian/patches/Fix-usage-of-unsafe-inplace-casting.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Wed, 27 Jan 2016 15:47:19 +0000
-Subject: Fix usage of unsafe inplace casting.
-
----
- tests/testxfm3.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/testxfm3.py b/tests/testxfm3.py
-index 850736b..39be6e3 100644
---- a/tests/testxfm3.py
-+++ b/tests/testxfm3.py
-@@ -16,8 +16,8 @@ def setup():
-     grid = slice(-(GRID_SIZE>>1), (GRID_SIZE>>1))
-     X, Y, Z = np.mgrid[grid,grid,grid]
- 
--    Y *= 1.2
--    Z *= 1.4
-+    Y = Y * 1.2
-+    Z = Z * 1.4
- 
-     r = np.sqrt(X*X + Y*Y + Z*Z)
-     ellipsoid = np.where(r <= SPHERE_RAD, 1.0, 0.0).astype(np.float64)
diff --git a/debian/patches/Use-explicit-integer-division.patch b/debian/patches/Use-explicit-integer-division.patch
deleted file mode 100644
index 43d6864..0000000
--- a/debian/patches/Use-explicit-integer-division.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Tue, 8 Mar 2016 10:01:07 +0000
-Subject: Use explicit integer division.
-
----
- dtcwt/numpy/lowlevel.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dtcwt/numpy/lowlevel.py b/dtcwt/numpy/lowlevel.py
-index 5310d35..4f6d700 100644
---- a/dtcwt/numpy/lowlevel.py
-+++ b/dtcwt/numpy/lowlevel.py
-@@ -1,4 +1,4 @@
--from __future__ import absolute_import
-+from __future__ import absolute_import, division
- 
- __all__ = [ 'colfilter', 'colifilt', 'coldfilt', ]
- 
-@@ -137,7 +137,7 @@ def coldfilt(X, ha, hb):
-     hbo = as_column_vector(hb[0:m:2])
-     hbe = as_column_vector(hb[1:m:2])
-     t = np.arange(5, r+2*m-2, 4)
--    r2 = r/2;
-+    r2 = r//2;
-     Y = np.zeros((r2,c), dtype=X.dtype)
- 
-     if np.sum(ha*hb) > 0:
diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch
index 9b31668..b7e390f 100644
--- a/debian/patches/reproducible-build.patch
+++ b/debian/patches/reproducible-build.patch
@@ -7,9 +7,9 @@ Last-Update: 2015-07-29
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/docs/conf.py
 +++ b/docs/conf.py
-@@ -26,6 +26,10 @@
- import dtcwt
- version = release = dtcwt.__version__
+@@ -30,6 +30,10 @@
+ import numpy
+ numpy.random.seed(0)
  
 +# Ensure a deterministic build by setting the random seed
 +import numpy
diff --git a/debian/patches/series b/debian/patches/series
index f6c82c0..afdd7ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 use-system-mathjax.patch
 reproducible-build.patch
-Fix-usage-of-unsafe-inplace-casting.patch
-Use-explicit-integer-division.patch
diff --git a/debian/patches/use-system-mathjax.patch b/debian/patches/use-system-mathjax.patch
index 9f5b327..3a3fe35 100644
--- a/debian/patches/use-system-mathjax.patch
+++ b/debian/patches/use-system-mathjax.patch
@@ -6,7 +6,7 @@ Forwarded: not-needed
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/docs/conf.py
 +++ b/docs/conf.py
-@@ -185,6 +185,9 @@
+@@ -191,6 +191,9 @@
  if os.environ.get('READTHEDOCS', None) == 'True':
      mathjax_path = 'https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-dtcwt.git