Run flake8 from root to test docs and scripts

[sqlconvert.git] / tox.ini

diff --git a/tox.ini b/tox.ini
index dec4e03af8da359af0d1d1b98dc8367158f3420e..ddd7a101a98ece82625c039f3f686a0b7442d7c4 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.8
-envlist = {py26,py27,py34},{py27,py34}-flake8
+envlist = {py26,py27,py34},{py26,py27,py34}-postgres,{py27,py34}-flake8
 
 # Base test environment settings
 [testenv]
@@ -9,17 +9,22 @@ deps =
     pytest
     pytest-cov
     py26: argparse
+    py26,py27: SQLObject>=2.2.1
+    py34: SQLObject>=3.0.0
     py26,py27: m_lib>=2.0
     py34: m_lib>=3.0
+    postgres: psycopg2
 sitepackages = True
 # Don't fail or warn on uninstalled commands
 whitelist_externals =
     flake8
-    py.test
+    createdb
+    dropdb
 
 [general]
 commands =
-    python /usr/local/bin/py.test --cov={envsitepackagesdir}/sqlconvert
+    python -m pytest --cov=sqlconvert
+    rm -f *.tmp
 
 [testenv:py26]
 commands = {[general]commands}
@@ -30,12 +35,29 @@ commands = {[general]commands}
 [testenv:py34]
 commands = {[general]commands}
 
+# PostgreSQL test environments
+[postgresql]
+commands =
+    createdb test
+    python -m pytest -D postgres:///test
+    dropdb test
+    rm -f *.tmp
+
+[testenv:py26-postgres]
+commands = {[postgresql]commands}
+
+[testenv:py27-postgres]
+commands = {[postgresql]commands}
+
+[testenv:py34-postgres]
+commands = {[postgresql]commands}
+
 [testenv:py27-flake8]
 deps =
     flake8
-commands = flake8 demo scripts sqlconvert tests
+commands = flake8
 
 [testenv:py34-flake8]
 deps =
     flake8
-commands = flake8 demo scripts sqlconvert tests
+commands = flake8