[python-geopandas] 04/07: Drop patches, included upstream.

[Bas 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 1e0b6b4cd63d1cec4c7bc70e1d3ecb6abea0cf78
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Aug 29 09:30:27 2017 +0200

    Drop patches, included upstream.
---
 debian/changelog                                   |  1 +
 ...ve-usage-of-assert_isinstance-from-pandas.patch | 35 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7274bfa..3cfc20c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ python-geopandas (0.3.0-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release.
+  * Drop patches, included upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 29 Aug 2017 09:26:55 +0200
 
diff --git a/debian/patches/remove-usage-of-assert_isinstance-from-pandas.patch b/debian/patches/remove-usage-of-assert_isinstance-from-pandas.patch
deleted file mode 100644
index ba07341..0000000
--- a/debian/patches/remove-usage-of-assert_isinstance-from-pandas.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: CLN/TST: remove usage of assert_isinstance from pandas
- (deprecated/removed) (#428)
-Author: Joris Van den Bossche <jorisvandenbossche at gmail.com>
-Origin: https://github.com/geopandas/geopandas/commit/4abbe827b99ceb6527b035a98ad80174e18a95dc
-Bug: https://github.com/geopandas/geopandas/pull/428
-Bug-Debian: https://bugs.debian.org/868964
-
---- a/geopandas/tests/util.py
-+++ b/geopandas/tests/util.py
-@@ -4,7 +4,6 @@ import sys
- import zipfile
- 
- from six.moves.urllib.request import urlopen
--from pandas.util.testing import assert_isinstance
- 
- from geopandas import GeoDataFrame, GeoSeries
- 
-@@ -195,7 +194,7 @@ def assert_geoseries_equal(left, right,
-     assert len(left) == len(right), "%d != %d" % (len(left), len(right))
- 
-     if check_index_type:
--        assert_isinstance(left.index, type(right.index))
-+        assert isinstance(left.index, type(right.index))
- 
-     if check_dtype:
-         assert left.dtype == right.dtype, "dtype: %s != %s" % (left.dtype,
-@@ -203,7 +202,7 @@ def assert_geoseries_equal(left, right,
- 
-     if check_series_type:
-         assert isinstance(left, GeoSeries)
--        assert_isinstance(left, type(right))
-+        assert isinstance(left, type(right))
- 
-         if check_crs:
-             assert(left.crs == right.crs)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 138038e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-remove-usage-of-assert_isinstance-from-pandas.patch

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