Merge pull request #32 from kjordahl/feature/travis-pandas-versions

Run Travis CI tests on multiple pandas versions

.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
+  - python setup.py install
+  - cd ..
 
 script:
   - nosetests -v

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

requirements.txt

@@ -1,4 +1,4 @@
-pandas>=0.12.0
+Cython>=0.16
 shapely>=1.2.18
 fiona>=1.0.1
 pyproj>=1.9.3