[rasterio] 05/13: Remove patches added upstream

[Johan Van de Wauw]

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

johanvdw-guest pushed a commit to branch master
in repository rasterio.

commit 137cb4d52ca7433d2a1bebdb6c09fb4d1ee44ab3
Author: Johan Van de Wauw <johan at vandewauw.be>
Date:   Tue Sep 29 10:08:38 2015 +0200

    Remove patches added upstream
---
 ...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 -
 3 files changed, 80 deletions(-)

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
deleted file mode 100644
index cac3c0f..0000000
--- a/debian/patches/0004-Adjust-test-to-no-longer-fail-on-i386.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From c3c67795adf59dd6e8d44007d180aae669ccbc52 Mon Sep 17 00:00:00 2001
-From: Johan Van de Wauw <johan.vandewauw at 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
deleted file mode 100644
index 2c1ed92..0000000
--- a/debian/patches/0005-Adjust-test-to-work-well-on-i386.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5c13f6d40c260230339215f480d9b81571c4b101 Mon Sep 17 00:00:00 2001
-From: Johan Van de Wauw <johan.vandewauw at 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 e8a44ef..9654eb2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 0001-Rename-rio-to-rasterio-Closes-788463.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