- add a tox.ini file

- update the readme.unittests a bit

4 files changed, 44 insertions, 5 deletions

diff --git a/.gitignore b/.gitignore
index 93554cb..a252ee8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,7 @@ dist/
 /docs/build/output/
 *.orig
 alembic.ini
-tox.ini
 .venv
 *.egg-info
 .coverage
+.tox
diff --git a/README.unittests b/README.unittests.rst
index 61796b6..b84aa7a 100644
--- a/README.unittests
+++ b/README.unittests.rst
@@ -1,14 +1,17 @@
 Running Unit Tests
 ==================
 
-Tests can be run using the nosetests runner:
+Tests can be run be run using via py.test, nose, or the Python setup.py script::
 
-	nosetests -v
+	py.test
 
-Or via the setup.py script:
+	nosetests -v
 
 	python setup.py test
 
+There's also a tox.ini file with several configurations::
+
+	tox
 
 Setting up Optional Databases
 ------------------------------
diff --git a/setup.cfg b/setup.cfg
index 530eb95..0052af8 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,6 +16,6 @@ identity = C4DAFEE1
 
 [pytest]
 addopts= --tb native -v -r fxX
-python_files=tests/*test_*.py
+python_files=tests/test_*.py
 
 
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..61da07d
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,36 @@
+[tox]
+envlist = full
+
+[testenv]
+deps=pytest
+     flake8
+     coverage
+     mock
+
+sitepackages=True
+usedevelop=True
+
+commands=
+  python -m pytest {posargs}
+
+[testenv:full]
+
+
+[testenv:coverage]
+
+commands=
+  python -m pytest \
+        --cov=alembic \
+        {posargs}
+  python -m coverage xml --include=alembic/*
+
+[testenv:pep8]
+commands = python -m flake8 {posargs}
+
+
+[flake8]
+
+show-source = True
+ignore = E711,E712,E721,F841,F811
+exclude=.venv,.git,.tox,dist,doc,*egg,build
+