From 9c6c18d274fc47ca3d77401fcfe1238d9481d4cb Mon Sep 17 00:00:00 2001
From: Noah Levitt <nlevitt@archive.org>
Date: Fri, 6 Dec 2013 15:22:29 -0800
Subject: [PATCH] nose.collector wasn't working

---
 setup.py | 4 ++--
 tox.ini  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index 2f956b3..f5d41b1 100755
--- a/setup.py
+++ b/setup.py
@@ -14,8 +14,8 @@ setuptools.setup(name='warcprox',
         packages=['warcprox'],
         install_requires=['pyopenssl', 'warctools>=4.8.3'],  # gdbm/dbhash?
         dependency_links=['git+https://github.com/nlevitt/warctools.git@python3#egg=warctools-4.8.3'],
-        tests_require=['nose', 'requests>=2.0.1'],  # >=2.0.1 for https://github.com/kennethreitz/requests/pull/1636
-        test_suite='nose.collector',
+        tests_require=['requests>=2.0.1'],  # >=2.0.1 for https://github.com/kennethreitz/requests/pull/1636
+        test_suite='warcprox.tests.test_warcprox',
         scripts=['bin/dump-anydbm', 'bin/warcprox'],
         zip_safe=False)
 
diff --git a/tox.ini b/tox.ini
index 2403045..fda5b09 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,5 +7,5 @@
 envlist = py27, py32, py33
 
 [testenv]
-commands = {envpython} setup.py test
-
+commands = {envpython} -m unittest discover
+deps = requests>=2.0.1