Merge pull request #358 from eriknw/fix/ensure_easy_testing

Fix/ensure easy testing

Author: eriknw

.travis.yml

@@ -13,7 +13,7 @@ env:
 
 # command to install dependencies
 install:
-    - pip install coverage pep8
+    - pip install coverage pep8 pytest
 
 # command to run tests
 # require 100% coverage (not including test files) to pass Travis CI test
@@ -24,6 +24,10 @@ script:
                    --with-doctest toolz/
     - if [[ $TRAVIS_PYTHON_VERSION != pypy* ]]; then coverage report --show-missing --fail-under=100 ; fi
     - if [[ $TRAVIS_PYTHON_VERSION != pypy* ]]; then pep8 --ignore=$PEP8_IGNORE --exclude=conf.py,tests,examples,bench -r --show-source . ; fi
+    # For convenience, make sure simple test commands work
+    - python setup.py develop
+    - py.test
+    - nosetests
 
 # load coverage status to https://coveralls.io
 after_success:

toolz/tests/test_serialization.py

@@ -1,6 +1,6 @@
 from toolz import *
 import toolz
-import toolz.curried.exceptions
+import toolz.curried
 import pickle
 from toolz.compatibility import PY3, PY33, PY34
 from toolz.utils import raises
@@ -62,8 +62,8 @@ def test_flip():
 
 def test_curried_exceptions():
     # This tests a global curried object that isn't defined in toolz.functoolz
-    merge = pickle.loads(pickle.dumps(toolz.curried.exceptions.merge))
-    assert merge is toolz.curried.exceptions.merge
+    merge = pickle.loads(pickle.dumps(toolz.curried.merge))
+    assert merge is toolz.curried.merge
 
 
 @toolz.curry