From 1545e7ca55d8f5f438951fe77126f287fc09d1ce Mon Sep 17 00:00:00 2001 From: Kelsey Jordahl Date: Fri, 6 Sep 2013 07:48:01 -0400 Subject: [PATCH 1/5] TST: Run Travis CI tests on both release and master versions of pandas --- .travis.yml | 9 +++++++++ requirements.txt | 1 - 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5ed2036..e39e2e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,10 @@ language: python python: - "2.7" +env: + - PANDAS_VERSION=v0.12.0 + - PANDAS_VERSION=master + before_install: - sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable - sudo apt-get update @@ -10,6 +14,11 @@ before_install: install: - pip install -r requirements.txt --use-mirrors + - git clone git://github.com/pydata/pandas.git + - cd pandas + - git checkout PANDAS_VERSION + - sudo /usr/bin/python setup.py install + - cd .. script: - nosetests -v diff --git a/requirements.txt b/requirements.txt index d407d7c..faddd90 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ -pandas>=0.12.0 shapely>=1.2.18 fiona>=1.0.1 pyproj>=1.9.3 From 8cc0036309ff77e1e5bfc17c74a75bd7966d498f Mon Sep 17 00:00:00 2001 From: Kelsey Jordahl Date: Fri, 6 Sep 2013 08:06:47 -0400 Subject: [PATCH 2/5] TST: Environment variable in .travis.yml needs to be preceeded by dollar sign --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e39e2e7..cac723f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ install: - pip install -r requirements.txt --use-mirrors - git clone git://github.com/pydata/pandas.git - cd pandas - - git checkout PANDAS_VERSION + - git checkout $PANDAS_VERSION - sudo /usr/bin/python setup.py install - cd .. From d32ade8d585e3f370f50ba72de614c8b8977e72c Mon Sep 17 00:00:00 2001 From: Kelsey Jordahl Date: Fri, 6 Sep 2013 08:22:13 -0400 Subject: [PATCH 3/5] TST: Add Cython to requirements (needed to build pandas) --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index faddd90..c35ccc0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ +Cython>=0.16 shapely>=1.2.18 fiona>=1.0.1 pyproj>=1.9.3 From 5017ab4ff7789b40e25be96e11706b418d5d5984 Mon Sep 17 00:00:00 2001 From: Kelsey Jordahl Date: Tue, 17 Sep 2013 22:10:21 -0400 Subject: [PATCH 4/5] TST: Try direct install of pandas in .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cac723f..f080112 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ install: - git clone git://github.com/pydata/pandas.git - cd pandas - git checkout $PANDAS_VERSION - - sudo /usr/bin/python setup.py install + - python setup.py install - cd .. script: From c0565df397edb7f06d5a6d0f4d3b692d669d48ad Mon Sep 17 00:00:00 2001 From: Kelsey Jordahl Date: Tue, 17 Sep 2013 23:22:17 -0400 Subject: [PATCH 5/5] BUG: Use generic **kwargs to catch changes in pandas method APIs --- geopandas/geoseries.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/geopandas/geoseries.py b/geopandas/geoseries.py index 9085add..6c8ca03 100644 --- a/geopandas/geoseries.py +++ b/geopandas/geoseries.py @@ -527,7 +527,7 @@ class GeoSeries(Series): return np.logical_or(non_geo_null, val) def fillna(self, value=EMPTY_POLYGON, method=None, inplace=False, - limit=None): + **kwargs): """Fill NA/NaN values with a geometry (empty polygon by default). "method" is currently not implemented for GeoSeries. @@ -544,12 +544,11 @@ class GeoSeries(Series): raise ValueError('Non-geometric fill values not allowed for GeoSeries') def align(self, other, join='outer', level=None, copy=True, - fill_value=EMPTY_POLYGON, method=None, limit=None): + fill_value=EMPTY_POLYGON, **kwargs): left, right = super(GeoSeries, self).align(other, join=join, level=level, copy=copy, fill_value=fill_value, - method=method, - limit=limit) + **kwargs) if isinstance(other, GeoSeries): return GeoSeries(left), GeoSeries(right) else: # It is probably a Series, let's keep it that way