From b9bc4134d1efac5f944c308c58ab5903f29f8a81 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Thu, 23 Sep 2010 11:44:49 +0200
Subject: [PATCH] Added tox

---
 .gitignore | 2 ++
 Makefile   | 2 +-
 setup.py   | 3 +--
 tox.ini    | 6 ++++++
 4 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 tox.ini

diff --git a/.gitignore b/.gitignore
index 92f55888..2944bfc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,10 @@
 .ropeproject
+.tox
 docs/_build
 logbook/_speedups.c
 logbook/_speedups.so
 Logbook.egg-info
+dist
 *.pyc
 env
 env*
diff --git a/Makefile b/Makefile
index a42e71bd..b5d213a5 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ clean-pyc:
 	find . -name '*~' -exec rm -f {} +
 
 test:
-	@python test_logbook.py --verbose
+	@python setup.py test
 
 bench:
 	@python benchmark/run.py
diff --git a/setup.py b/setup.py
index 6632fb3b..05f2959c 100644
--- a/setup.py
+++ b/setup.py
@@ -111,13 +111,12 @@ def run_setup(with_binary):
         author_email='armin.ronacher@active-4.com',
         description='A logging replacement for Python',
         long_description=__doc__,
-        packages=['logbook'],
+        packages=['logbook', 'logbook.testsuite'],
         zip_safe=False,
         platforms='any',
         tests_require='''
             SQLAlchemy>=0.6
         ''',
-        test_suite='test_logbook',
         cmdclass=cmdclass,
         features=features,
         **extra
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..dfee1949
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,6 @@
+[tox]
+envlist=py25,py26,py27,py31
+
+[testenv]
+deps=SQLAlchemy
+commands=make test