Merge pull request #202 from geopandas/geopy-version

Update geopy version

.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:

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}
 

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

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
@@ -124,13 +122,12 @@ 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'],
                                pd.Series(self.locations, name='address'))
 
-
     def test_reverse(self):
         with mock.patch('geopy.geocoders.googlev3.GoogleV3.reverse',
                         ReverseMock()) as m:
@@ -141,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)