[skimage] 01/02: Fix shape type for histogram to fix FTBFS with new numpy

Ole Streicher olebole at moszumanska.debian.org
Fri Dec 23 11:04:01 UTC 2016


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

olebole pushed a commit to branch master
in repository skimage.

commit 4ac05c921c7998db55927d0defc40e7ea2dc9f9f
Author: Ole Streicher <olebole at debian.org>
Date:   Fri Dec 23 12:01:57 2016 +0100

    Fix shape type for histogram to fix FTBFS with new numpy
---
 debian/patches/fix_shape_type.patch | 15 +++++++++++++++
 debian/patches/series               |  1 +
 2 files changed, 16 insertions(+)

diff --git a/debian/patches/fix_shape_type.patch b/debian/patches/fix_shape_type.patch
new file mode 100644
index 0000000..110de74
--- /dev/null
+++ b/debian/patches/fix_shape_type.patch
@@ -0,0 +1,15 @@
+Author: Ole Streicher <olebole at debian.org>
+Description: Fix shape type for histogram
+
+The number of bins is always an integer, independently of the image data type.
+--- a/skimage/filters/rank/generic.py
++++ b/skimage/filters/rank/generic.py
+@@ -977,7 +977,7 @@
+     """
+ 
+     if n_bins is None:
+-        n_bins = image.max() + 1
++        n_bins = int(image.max()) + 1
+ 
+     return _apply_vector_per_pixel(generic_cy._windowed_hist, image, selem,
+                                    out=out, mask=mask,
diff --git a/debian/patches/series b/debian/patches/series
index 42f40e4..55d477b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,5 @@ dask-optional-dep.patch
 search-html.patch
 fix-doc-links.patch
 doc-privacy.patch
+fix_shape_type.patch
 skip_tests_failing_on_some_architectures.patch

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



More information about the debian-science-commits mailing list