Merge aa1ec27 into 8a3e188

requirements-py2.txt

@@ -1,16 +1,7 @@
+-r requirements-py3.txt
+
 argparse>=1.2.1
-nose>=1.1.2
-python-dateutil==2.2
-SQLAlchemy>=0.9.3
-sphinx>=1.0.7
-coverage>=3.5.1b1
-tox>=1.3
-dbf>=0.96.005
-unittest2==0.5.1
-six>=1.6.1
+mock>=1.3.0
 ordereddict>=1.1
 simplejson>=3.6.3
-sphinx_rtd_theme
-mock>=1.3.0
-git+git://github.com/onyxfish/agate.git#egg=agate
-git+git://github.com/onyxfish/agate-excel.git#egg=agate-excel
+unittest2==0.5.1

requirements-py3.txt

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