From 8fa1c7c906208c74f7da7e9d1d7042f74d148ccc Mon Sep 17 00:00:00 2001
From: Erik Welch <erik.n.welch@gmail.com>
Date: Wed, 21 Dec 2016 22:29:13 -0800
Subject: [PATCH 1/4] Make sure bare test commands succeed.

---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 883d5fe0..77644858 100644
--- a/.travis.yml
+++ b/.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,9 @@ 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
+    - py.test
+    - nosetests
 
 # load coverage status to https://coveralls.io
 after_success:

From b837eacc04999cbcc27fc34ad52679dff63e8dcd Mon Sep 17 00:00:00 2001
From: Erik Welch <erik.n.welch@gmail.com>
Date: Wed, 21 Dec 2016 22:34:16 -0800
Subject: [PATCH 2/4] Aha, we need to install `toolz` first!

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 77644858..988e13fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,7 @@ script:
     - 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 install
     - py.test
     - nosetests
 

From bfbed05f2d0f19c254cc181cd5c9191ca016acb5 Mon Sep 17 00:00:00 2001
From: Erik Welch <erik.n.welch@gmail.com>
Date: Wed, 21 Dec 2016 22:38:47 -0800
Subject: [PATCH 3/4] Don't import or reference `toolz.curried.exceptions`.

---
 toolz/tests/test_serialization.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/toolz/tests/test_serialization.py b/toolz/tests/test_serialization.py
index afee159f..1780c508 100644
--- a/toolz/tests/test_serialization.py
+++ b/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

From 6af6d30cedc50299852533b136a78a9fbc7792b6 Mon Sep 17 00:00:00 2001
From: Erik Welch <erik.n.welch@gmail.com>
Date: Wed, 21 Dec 2016 22:41:38 -0800
Subject: [PATCH 4/4] How 'bout we `develop` instead of `install`

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 988e13fe..b4e82fcb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ script:
     - 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 install
+    - python setup.py develop
     - py.test
     - nosetests