[python-geopandas] 09/12: Drop patches, applied upstream.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository python-geopandas.

commit 4ffb9f8c7d826e3baed794f457a1092d51efb5f4
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jun 10 22:10:58 2016 +0200

    Drop patches, applied upstream.
---
 debian/changelog                             |  1 +
 debian/patches/0001-Fix-tests.patch          | 30 ----------------------------
 debian/patches/0002-Fix-plotting-tests.patch | 16 ---------------
 debian/patches/series                        |  2 --
 4 files changed, 1 insertion(+), 48 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 614bc96..55c3f74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ python-geopandas (0.2-1) UNRELEASED; urgency=medium
     - Update copyright years for Geopandas developers
     - Add license & copyright for versioneer.py & nybb_16a.zip
   * Bump Standards-Version to 3.9.8, no changes.
+  * Drop patches, applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 10 Jun 2016 22:23:19 +0200
 
diff --git a/debian/patches/0001-Fix-tests.patch b/debian/patches/0001-Fix-tests.patch
deleted file mode 100644
index 0486e6c..0000000
--- a/debian/patches/0001-Fix-tests.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Johan Van de Wauw <johan.vandewauw at gmail.com>
-Date: Tue, 9 Jun 2015 19:11:04 +0200
-Subject: Fix tests
-
-Based on upstream commit
-https://github.com/geopandas/geopandas/commit/cb62e9f80bbd5e3cf695898ca01e2a1009e73a5d
----
- tests/test_types.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_types.py b/tests/test_types.py
-index fdd14f5..f4b0dad 100644
---- a/tests/test_types.py
-+++ b/tests/test_types.py
-@@ -39,7 +39,7 @@ class TestSeries(unittest.TestCase):
-         assert type(self.pts.iloc[5:]) is GeoSeries
- 
-     def test_fancy(self):
--        idx = (self.pts.index % 2).astype(bool)
-+        idx = (self.pts.index.to_series() % 2).astype(bool)
-         assert type(self.pts[idx]) is GeoSeries
- 
-     def test_take(self):
-@@ -85,5 +85,5 @@ class TestDataFrame(unittest.TestCase):
-         assert type(self.df[::2]) is GeoDataFrame
- 
-     def test_fancy(self):
--        idx = (self.df.index % 2).astype(bool)
-+        idx = (self.df.index.to_series() % 2).astype(bool)
-         assert type(self.df[idx]) is GeoDataFrame
diff --git a/debian/patches/0002-Fix-plotting-tests.patch b/debian/patches/0002-Fix-plotting-tests.patch
deleted file mode 100644
index dcab114..0000000
--- a/debian/patches/0002-Fix-plotting-tests.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Increase tolerance to fix test failures.
-Author: Matthew Perry <perrygeo at gmail.com>
-Origin: https://github.com/geopandas/geopandas/commit/c4d9aa15f00247a4ec10d118267a16243ff5bfe8#diff-682fec388a6b6bf28d626072e6357aa0
-Bug-Debian: https://bugs.debian.org/792589
-
---- a/tests/test_plotting.py
-+++ b/tests/test_plotting.py
-@@ -32,7 +32,7 @@ class PlotTests(unittest.TestCase):
-         shutil.rmtree(self.tempdir)
-         return
- 
--    def _compare_images(self, ax, filename, tol=8):
-+    def _compare_images(self, ax, filename, tol=10):
-         """ Helper method to do the comparisons """
-         assert isinstance(ax, Artist)
-         if GENERATE_BASELINE:
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6593252..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Fix-tests.patch
-0002-Fix-plotting-tests.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-geopandas.git