X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=tox.ini;h=6feee24747adef5a717568e83515b915da9e0c3f;hb=fddbaa14a1e033373080dc322a5b6c0ef388ee72;hp=eb6b3550ced5083e3ed9375c3f1ef48580e61ae4;hpb=a8651752de6da58ae65dac089d293c2ae15cd069;p=sqlconvert.git

diff --git a/tox.ini b/tox.ini
index eb6b355..6feee24 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.8
-envlist = {py26,py27,py34,py35,py36},{py26,py27,py34,py35,py36}-{postgres,sqlite},{py27,py34}-flake8
+envlist = {py27,py34,py35,py36},{py27,py34,py35,py36}-{postgres,sqlite},{py27,py34}-flake8
 
 # Base test environment settings
 [testenv]
@@ -13,14 +13,7 @@ commands =
     {envpython} --version
     {envpython} -c "import struct; print(struct.calcsize('P') * 8)"
 deps =
-    sqlparse
-    pytest
-    pytest-cov
-    py26: argparse
-    py2{6,7}: SQLObject>=2.2.1
-    py3{4,5,6}: SQLObject>=3.0.0
-    m_lib>=3.1
-    m_lib.defenc>=1.0
+    -rdevscripts/requirements/requirements_tests.txt
     postgres: psycopg2
 sitepackages = True
 # Don't fail or warn on uninstalled commands
@@ -34,11 +27,8 @@ commands =
     {[testenv]commands}
     {envpython} -m pytest --cov=sqlconvert
     {envpython} {envbindir}/mysql2sql -P demo/demo.sql test.out
-    {envpython} devscripts/cmp.py -i tests/mysql2sql/test.out test.out
-    {envpython} devscripts/rm.py test.out
-
-[testenv:py26]
-commands = {[general]commands}
+    {envpython} {envbindir}/cmp.py -i tests/mysql2sql/test.out test.out
+    {envpython} {envbindir}/rm.py test.out
 
 [testenv:py27]
 commands = {[general]commands}
@@ -61,9 +51,6 @@ commands =
     {envpython} -m pytest --cov=sqlconvert -D postgres:///test
     dropdb test
 
-[testenv:py26-postgres]
-commands = {[postgresql]commands}
-
 [testenv:py27-postgres]
 commands = {[postgresql]commands}
 
@@ -80,11 +67,9 @@ commands = {[postgresql]commands}
 [sqlite]
 commands =
     {[testenv]commands}
+    -{envpython} {envbindir}/rm.py /tmp/test.sqdb
     {envpython} -m pytest --cov=sqlconvert -D sqlite:///tmp/test.sqdb
-    {envpython} devscripts/rm.py /tmp/test.sqdb
-
-[testenv:py26-sqlite]
-commands = {[sqlite]commands}
+    {envpython} {envbindir}/rm.py /tmp/test.sqdb
 
 [testenv:py27-sqlite]
 commands = {[sqlite]commands}