From 37845786e780ebe276f63c04e1093ca36f4d0e5d Mon Sep 17 00:00:00 2001 From: Kelsey Jordahl Date: Sat, 11 Jul 2015 11:45:30 -0500 Subject: [PATCH 1/7] CLN: Remove Mapquest geocoding API (no longer supported upstream) --- geopandas/tools/geocoding.py | 1 - 1 file changed, 1 deletion(-) diff --git a/geopandas/tools/geocoding.py b/geopandas/tools/geocoding.py index ca30066..c4b96df 100644 --- a/geopandas/tools/geocoding.py +++ b/geopandas/tools/geocoding.py @@ -124,7 +124,6 @@ def _query(data, forward, provider, **kwargs): coders = {'googlev3': geopy.geocoders.GoogleV3, 'bing': geopy.geocoders.Bing, 'yahoo': Yahoo, - 'mapquest': geopy.geocoders.MapQuest, 'openmapquest': geopy.geocoders.OpenMapQuest, 'nominatim': geopy.geocoders.Nominatim} From e8d39c6365ffa7ad6099ec149310719a079625f4 Mon Sep 17 00:00:00 2001 From: Kelsey Jordahl Date: Sat, 11 Jul 2015 11:46:01 -0500 Subject: [PATCH 2/7] TST: Use more current geopy in tests --- requirements.test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.test.txt b/requirements.test.txt index 1112d88..2a937fc 100644 --- a/requirements.test.txt +++ b/requirements.test.txt @@ -1,6 +1,6 @@ psycopg2>=2.5.1 SQLAlchemy>=0.8.3 -geopy==0.99 +geopy==1.10.0 matplotlib>=1.2.1 descartes>=1.0 mock>=1.0.1 # technically not need for python >= 3.3 From 91dc4dd36348baba075f7f3170ceef1f7fb61ebf Mon Sep 17 00:00:00 2001 From: Kelsey Jordahl Date: Sat, 11 Jul 2015 12:11:39 -0500 Subject: [PATCH 3/7] CLN: Remove extra line --- tests/test_geocode.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test_geocode.py b/tests/test_geocode.py index 039d024..ccf2c14 100644 --- a/tests/test_geocode.py +++ b/tests/test_geocode.py @@ -130,7 +130,6 @@ class TestGeocode(unittest.TestCase): tm.assert_series_equal(g['address'], pd.Series(self.locations, name='address')) - def test_reverse(self): with mock.patch('geopy.geocoders.googlev3.GoogleV3.reverse', ReverseMock()) as m: From 4b1bd2854132f24788b10a6341ea7d3f2617e5a8 Mon Sep 17 00:00:00 2001 From: Kelsey Jordahl Date: Sat, 11 Jul 2015 12:11:53 -0500 Subject: [PATCH 4/7] CLN: Remove unused import --- tests/test_geocode.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/test_geocode.py b/tests/test_geocode.py index ccf2c14..62d955b 100644 --- a/tests/test_geocode.py +++ b/tests/test_geocode.py @@ -1,7 +1,5 @@ from __future__ import absolute_import -import sys - from fiona.crs import from_epsg import pandas as pd import pandas.util.testing as tm From 091f960c8f0415acf543b40cb468d8cf33c0539e Mon Sep 17 00:00:00 2001 From: Kelsey Jordahl Date: Sat, 11 Jul 2015 12:30:02 -0500 Subject: [PATCH 5/7] TST: Add name attribute to test series --- tests/test_geocode.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_geocode.py b/tests/test_geocode.py index 62d955b..6f86849 100644 --- a/tests/test_geocode.py +++ b/tests/test_geocode.py @@ -138,6 +138,6 @@ class TestGeocode(unittest.TestCase): expected = GeoSeries(self.points, crs=from_epsg(4326)) assert_geoseries_equal(expected, g['geometry']) - tm.assert_series_equal(g['address'], - pd.Series('address' + str(x) - for x in range(len(self.points)))) + address = pd.Series(['address' + str(x) for x in range(len(self.points))], + name='address') + tm.assert_series_equal(g['address'], address) From 3d3f8a096c3b329421e5bf6aa806c7f0e09586dd Mon Sep 17 00:00:00 2001 From: Kelsey Jordahl Date: Sat, 11 Jul 2015 12:30:45 -0500 Subject: [PATCH 6/7] CLN: space around operator --- tests/test_geocode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_geocode.py b/tests/test_geocode.py index 6f86849..529ab0a 100644 --- a/tests/test_geocode.py +++ b/tests/test_geocode.py @@ -122,7 +122,7 @@ class TestGeocode(unittest.TestCase): n = len(self.locations) self.assertIsInstance(g, gpd.GeoDataFrame) - expected = GeoSeries([Point(float(x)+0.5, float(x)) for x in range(n)], + expected = GeoSeries([Point(float(x) + 0.5, float(x)) for x in range(n)], crs=from_epsg(4326)) assert_geoseries_equal(expected, g['geometry']) tm.assert_series_equal(g['address'], From c785db02250e7a7ebf8792af1e66772c7bbad47b Mon Sep 17 00:00:00 2001 From: Kelsey Jordahl Date: Sat, 11 Jul 2015 11:38:04 -0500 Subject: [PATCH 7/7] TST: pandas 0.16.0 -> 0.16.2 in travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c2ddc0f..77fd627 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ python: env: - PANDAS_VERSION=v0.15.2 - - PANDAS_VERSION=v0.16.0 + - PANDAS_VERSION=v0.16.2 - PANDAS_VERSION=master before_install: