From c02291e958214e18d60fa51716889db963a640da Mon Sep 17 00:00:00 2001 From: Kelsey Jordahl Date: Wed, 6 Aug 2014 13:18:13 -0700 Subject: [PATCH 1/5] Install libgdal1h from ubuntugis ppa on Travis CI --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fd62b85..4ec2332 100644 --- a/.travis.yml +++ b/.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 From 33651b39bae0e1a998ff004c44acdecf71e5d4cd Mon Sep 17 00:00:00 2001 From: Kelsey Jordahl Date: Wed, 6 Aug 2014 14:25:32 -0700 Subject: [PATCH 2/5] TST: Lock geopy version ==0.99 --- requirements.test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.test.txt b/requirements.test.txt index fcf829b..69b4255 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==0.99 matplotlib>=1.2.1 descartes>=1.0 pytest-cov From 95d2e20fe59af0ace72c3ab2faef1e0157a4735e Mon Sep 17 00:00:00 2001 From: Kelsey Jordahl Date: Thu, 7 Aug 2014 16:33:37 -0700 Subject: [PATCH 3/5] TST: Disable pandas master tests for python 2.6 and 3.2 --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4ec2332..42f6db7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,13 @@ 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 From 94116ceba7659fdad97721cdf65f7446a2b7342f Mon Sep 17 00:00:00 2001 From: Jacob Wasserman Date: Sat, 16 Aug 2014 12:53:15 -0400 Subject: [PATCH 4/5] Revert "TST: Disable pandas master tests..." This reverts commit 95d2e20fe59af0ace72c3ab2faef1e0157a4735e. --- .travis.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 42f6db7..4ec2332 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,13 +12,6 @@ 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 From 1e0c2ed582b102f40765535f9b63016bdfa63565 Mon Sep 17 00:00:00 2001 From: Jacob Wasserman Date: Sat, 16 Aug 2014 12:54:21 -0400 Subject: [PATCH 5/5] BUG/TST: Fix tests - don't do math on Index Treat Index objects as set-like. Convert to Series before doing arithmetic. This broke when Pandas Index no longer subclassed from NDArray. --- tests/test_types.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_types.py b/tests/test_types.py index fdd14f5..f4b0dad 100644 --- a/tests/test_types.py +++ b/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