Merge pull request #157 from jwass/fix_travis

Fix tests

.travis.yml

@@ -15,7 +15,7 @@ env:
 before_install:
   - sudo add-apt-repository -y ppa:ubuntugis/ppa
   - sudo apt-get update
-  - sudo apt-get install gdal-bin libgdal-dev libspatialindex-dev libspatialindex1
+  - sudo apt-get install libgdal1h gdal-bin libgdal-dev libspatialindex-dev libspatialindex1
 #  - sudo -u postgres psql -c "drop database if exists test_geopandas"
 #  - sudo -u postgres psql -c "create database test_geopandas"
 #  - sudo -u postgres psql -c "create extension postgis" -d test_geopandas

requirements.test.txt

@@ -1,6 +1,6 @@
 psycopg2>=2.5.1
 SQLAlchemy>=0.8.3
-geopy>=0.99
+geopy==0.99
 matplotlib>=1.2.1
 descartes>=1.0
 pytest-cov

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