rebase to master

UDST · Sep 2, 2014 · aaaadee · aaaadee
1 parent 578c608
commit aaaadee
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/setup.py b/setup.py
@@ -32,7 +32,6 @@
     packages=find_packages(exclude=['*.tests']),
     install_requires=[
         'bottle>=0.12.5',
-        'geopandas>=0.1.0',
         'matplotlib>=1.3.1',
         'numpy>=1.8.0',
         'pandas>=0.13.1',
@@ -46,6 +45,7 @@
         'toolz>=0.7.0'
     ],
     extras_require = {
-        'pandana': ['pandana>=0.1']
+        'pandana': ['pandana>=0.1'],
+        'geopandas': ['geopandas>=0.1.0']
     }
 )