This is an automated email from the git hooks/post-receive script. johanvdw-guest pushed a commit to branch ubuntu/wily in repository rasterio.
commit 48cf0b1d03165f4fe4ce9733696076e51416275d Author: Johan Van de Wauw <johan.vandew...@gmail.com> Date: Thu Aug 20 13:42:25 2015 +0200 Fix tests on i386 --- debian/changelog | 6 +++ ...004-Adjust-test-to-no-longer-fail-on-i386.patch | 49 ++++++++++++++++++++++ .../0005-Adjust-test-to-work-well-on-i386.patch | 29 +++++++++++++ debian/patches/series | 2 + 4 files changed, 86 insertions(+) diff --git a/debian/changelog b/debian/changelog index ebaec40..649286c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +rasterio (0.24.0-1ubuntu1) wily; urgency=medium + + * Fix tests on i386 + + -- Johan Van de Wauw <johan.vandew...@gmail.com> Thu, 20 Aug 2015 13:42:03 +0200 + rasterio (0.24.0-1) unstable; urgency=medium * Imported Upstream version 0.24.0 diff --git a/debian/patches/0004-Adjust-test-to-no-longer-fail-on-i386.patch b/debian/patches/0004-Adjust-test-to-no-longer-fail-on-i386.patch new file mode 100644 index 0000000..cac3c0f --- /dev/null +++ b/debian/patches/0004-Adjust-test-to-no-longer-fail-on-i386.patch @@ -0,0 +1,49 @@ +From c3c67795adf59dd6e8d44007d180aae669ccbc52 Mon Sep 17 00:00:00 2001 +From: Johan Van de Wauw <johan.vandew...@gmail.com> +Date: Mon, 17 Aug 2015 20:19:30 +0200 +Subject: [PATCH 1/2] Adjust test to no longer fail on i386 + +See discussion on gdal-dev mailinglist: +https://lists.osgeo.org/pipermail/gdal-dev/2015-August/042380.html + +"Changing very slightly the test case should hopefully hide that annoyance." + +and the original bug report: +https://github.com/mapbox/rasterio/issues/229 +--- + tests/test_read_resample.py | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +diff --git a/tests/test_read_resample.py b/tests/test_read_resample.py +index d21c0a4..5593cf7 100644 +--- a/tests/test_read_resample.py ++++ b/tests/test_read_resample.py +@@ -10,16 +10,17 @@ import rasterio + + def test_read_out_shape_resample_down(): + with rasterio.open('tests/data/RGB.byte.tif') as s: +- out = numpy.zeros((7, 8), dtype=rasterio.ubyte) ++ out = numpy.zeros((8, 8), dtype=rasterio.ubyte) + data = s.read(1, out=out) + expected = numpy.array([ +- [ 0, 8, 5, 7, 0, 0, 0, 0], +- [ 0, 6, 61, 15, 27, 15, 24, 128], +- [ 0, 20, 152, 23, 15, 19, 28, 0], +- [ 0, 17, 255, 25, 255, 22, 32, 0], +- [ 9, 7, 14, 16, 19, 18, 36, 0], +- [ 6, 27, 43, 207, 38, 31, 73, 0], +- [ 0, 0, 0, 0, 74, 23, 0, 0]], dtype=numpy.uint8) ++ [ 0, 0, 20, 15, 0, 0, 0, 0], ++ [ 0, 6, 193, 9, 255, 127, 23, 39], ++ [ 0, 7, 27, 255, 193, 14, 28, 34], ++ [ 0, 31, 29, 44, 14, 22, 43, 0], ++ [ 0, 9, 69, 49, 17, 22, 255, 0], ++ [ 11, 7, 13, 25, 13, 29, 33, 0], ++ [ 8, 10, 88, 27, 20, 33, 25, 0], ++ [ 0, 0, 0, 0, 98, 23, 0, 0]], dtype=numpy.uint8) + assert (data == expected).all() # all True. + + +-- +2.1.4 + diff --git a/debian/patches/0005-Adjust-test-to-work-well-on-i386.patch b/debian/patches/0005-Adjust-test-to-work-well-on-i386.patch new file mode 100644 index 0000000..2c1ed92 --- /dev/null +++ b/debian/patches/0005-Adjust-test-to-work-well-on-i386.patch @@ -0,0 +1,29 @@ +From 5c13f6d40c260230339215f480d9b81571c4b101 Mon Sep 17 00:00:00 2001 +From: Johan Van de Wauw <johan.vandew...@gmail.com> +Date: Mon, 17 Aug 2015 20:46:11 +0200 +Subject: [PATCH 2/2] Adjust test to work well on i386 + +--- + tests/test_rio_features.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/test_rio_features.py b/tests/test_rio_features.py +index dd3da8e..1ce7807 100644 +--- a/tests/test_rio_features.py ++++ b/tests/test_rio_features.py +@@ -310,10 +310,10 @@ def test_shapes_compact(runner): + + def test_shapes_sampling(runner): + result = runner.invoke( +- features.shapes, ['tests/data/shade.tif', '--sampling', '10']) ++ features.shapes, ['tests/data/shade.tif', '--sampling', '11']) + assert result.exit_code == 0 + assert result.output.count('"FeatureCollection"') == 1 +- assert result.output.count('"Feature"') == 124 ++ assert result.output.count('"Feature"') == 117 + + + def test_shapes_precision(runner): +-- +2.1.4 + diff --git a/debian/patches/series b/debian/patches/series index 3c98fe7..68efca3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,5 @@ 0001-Rename-rio-to-rasterio-Closes-788463.patch 0002-Fix-compatibility-with-Cython-0.22.patch 0003-Fix-compatibility-with-numpy-1.9.patch +0004-Adjust-test-to-no-longer-fail-on-i386.patch +0005-Adjust-test-to-work-well-on-i386.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/rasterio.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel