summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Horel2020-01-12 20:51:50 -0500
committerGuillaume Horel2020-01-12 20:51:50 -0500
commite6eeddfacb78bc2b432c327d04bc605d7c5f3609 (patch)
tree517042350296efe9a0a11542d0c91eae39b7d2e1
parent1f01b433fa8a6ef58331dea8ddfe4a3e9ac1c515 (diff)
downloadaur-e6eeddfacb78bc2b432c327d04bc605d7c5f3609.tar.gz
really remove the patch
-rw-r--r--1227.patch56
1 files changed, 0 insertions, 56 deletions
diff --git a/1227.patch b/1227.patch
deleted file mode 100644
index 2eea0531cf76..000000000000
--- a/1227.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 3bd2caa67fb61d154677706a18fa23be027a184d Mon Sep 17 00:00:00 2001
-From: Joris Van den Bossche <jorisvandenbossche@gmail.com>
-Date: Fri, 29 Nov 2019 11:07:56 +0100
-Subject: [PATCH] TST: fix tests to work with rtree 0.9
-
----
- geopandas/tests/test_sindex.py | 24 ++++++++++++++++++------
- 1 file changed, 18 insertions(+), 6 deletions(-)
-
-diff --git a/geopandas/tests/test_sindex.py b/geopandas/tests/test_sindex.py
-index 71ab30ea..fe1ab422 100644
---- a/geopandas/tests/test_sindex.py
-+++ b/geopandas/tests/test_sindex.py
-@@ -1,3 +1,4 @@
-+from distutils.version import LooseVersion
- import sys
-
- from shapely.geometry import Point, Polygon
-@@ -11,8 +12,16 @@
- @pytest.mark.skipif(sys.platform.startswith("win"), reason="fails on AppVeyor")
- @pytest.mark.skipif(not base.HAS_SINDEX, reason="Rtree absent, skipping")
- class TestSeriesSindex:
-- def test_empty_index(self):
-- assert GeoSeries().sindex is None
-+ def test_empty_geoseries(self):
-+ import rtree
-+
-+ if LooseVersion(rtree.__version__) >= LooseVersion("0.9"):
-+ # See https://github.com/Toblerity/rtree/issues/122
-+ # rtree version 0.9 now creates an empty index instead of raising
-+ # an error (which was captured when creating the sindex)
-+ assert GeoSeries().sindex is not None
-+ else:
-+ assert GeoSeries().sindex is None
-
- def test_point(self):
- s = GeoSeries([Point(0, 0)])
-@@ -24,11 +33,14 @@ def test_point(self):
-
- def test_empty_point(self):
- s = GeoSeries([Point()])
-- assert s.sindex is None
-- assert s._sindex_generated is True
-+ import rtree
-
-- def test_empty_geo_series(self):
-- assert GeoSeries().sindex is None
-+ if LooseVersion(rtree.__version__) >= LooseVersion("0.9"):
-+ # see above
-+ assert s.sindex is not None
-+ else:
-+ assert s.sindex is None
-+ assert s._sindex_generated is True
-
- def test_polygons(self):
- t1 = Polygon([(0, 0), (1, 0), (1, 1)])