moved tests out of datatools, setup.py installs dependencies and tests

Author: Alvin Wan

README.md

@@ -2,4 +2,20 @@
 
 data tools for UC Berkeley's Data Science 10 course
 
-*written by Professor [John DeNero](http://denero.org), Professor [David Culler](http://www.cs.berkeley.edu/~culler), and [Alvin Wan](http://alvinwan.com)*
+*written by Professor [John DeNero](http://denero.org), Professor [David Culler](http://www.cs.berkeley.edu/~culler), and [Alvin Wan](http://alvinwan.com)*
+
+## Installation
+
+Use pip. The latest version is v0.1
+
+```
+pip install git+git://github.com/alvinwan/datatools.git@v01
+```
+
+If you clone this repository, you may run tests against datatools.
+
+```
+python setup.py test
+```
+
+If you encounter an `Image not found` error on **Mac OSX**, you may need an [XQuartz upgrade](http://xquartz.macosforge.org/landing/).

setup.py

@@ -1,8 +1,43 @@
+import sys
 from distutils.core import setup
+from setuptools.command.test import test as TestCommand
+
+install_requires = [
+  'numpy',
+  'matplotlib',
+  'pandas'
+]
+
+test_requires = [
+  'pytest'
+]
+
+class PyTest(TestCommand):
+    user_options = [('pytest-args=', 'a', "Arguments to pass to py.test")]
+
+    def initialize_options(self):
+        TestCommand.initialize_options(self)
+        self.pytest_args = []
+
+    def finalize_options(self):
+        TestCommand.finalize_options(self)
+        self.test_args = []
+        self.test_suite = True
+
+    def run_tests(self):
+        #import here, cause outside the eggs aren't loaded
+        import pytest
+        errno = pytest.main(self.pytest_args)
+        sys.exit(errno)
+
+
 setup(
   name = 'datatools',
   packages = ['datatools'],
   version = '0.1',
+  install_requires = install_requires,
+  tests_require = test_requires,
+  cmdclass = {'test': PyTest},
   description = 'datatools for UC Berkeley\'s DS10 course',
   author = 'John DeNero, David Culler, Alvin Wan',
   author_email = '',

tests/test_data.py

@@ -1,4 +1,4 @@
-from lib.data import *
+from datatools.data import *
 import re
 import pytest
 from numpy.testing import assert_array_equal