Merge pull request #544 from onyxfish/dependencies

Remove openpyxl and xlrd dependencies

requirements-py2.txt

@@ -1,7 +1,9 @@
 -r requirements-py3.txt
 
 argparse>=1.2.1
-mock>=1.3.0
 ordereddict>=1.1
 simplejson>=3.6.3
+
+# Development
+mock>=1.3.0
 unittest2==0.5.1

requirements-py3.txt

@@ -1,11 +1,13 @@
-coverage>=3.5.1b1
+git+git://github.com/onyxfish/agate.git#egg=agate
+git+git://github.com/onyxfish/agate-excel.git#egg=agate-excel
 dbf>=0.96.005
-nose>=1.1.2
 python-dateutil>=2.2
 six>=1.6.1
+SQLAlchemy>=0.9.3
+
+# Development
+coverage>=3.5.1b1
+nose>=1.1.2
 sphinx>=1.0.7
 sphinx_rtd_theme
-SQLAlchemy>=0.9.3
 tox>=1.3
-git+git://github.com/onyxfish/agate-excel.git#egg=agate-excel
-git+git://github.com/onyxfish/agate.git#egg=agate

setup.py

@@ -5,12 +5,11 @@
 
 install_requires = [
     'agate>=1.2.0',
+    'agate-excel>=0.1.0',
     'dbf>=0.96.005',
-    'openpyxl==2.2.6',
     'python-dateutil==2.2',
     'six>=1.6.1',
     'sqlalchemy>=0.6.6',
-    'xlrd>=0.7.1',
 ]
 
 if sys.version_info < (2, 7):