Merge pull request #35 from dukebody/fix_tests

Correctly install and use mock module for python 2 and 3.

Author: calpaterson

tests/test_dataframe_mapper.py

@@ -1,5 +1,11 @@
 import pytest
-from mock import Mock
+
+# In py3, mock is included with the unittest standard library
+# In py2, it's a separate package
+try:
+    from unittest.mock import Mock
+except ImportError:
+    from mock import Mock
 
 from pandas import DataFrame
 import pandas as pd

tox.ini

@@ -8,6 +8,7 @@ deps =
      setuptools==16.0
      wheel==0.24.0
      flake8==2.4.1
+     py27: mock==1.3.0
 
 commands =
          pip install numpy --no-index
@@ -16,4 +17,4 @@ commands =
          pip install scikit-learn --no-index
          python setup.py develop
          flake8 tests
-         py.test
+         py.test