Merge 95d2e20 into cbf604a

geopandas · Aug 7, 2014 · 9b222ca · 9b222ca
2 parents cbf604a + 95d2e20
commit 9b222ca
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,10 +12,17 @@ env:
   - PANDAS_VERSION=v0.14.1
   - PANDAS_VERSION=master
 
+matrix:
+  exclude:
+    - python: 2.6
+      env: PANDAS_VERSION=master
+    - python: 3.2
+      env: PANDAS_VERSION=master
+
 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

diff --git a/requirements.test.txt b/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