Move hard requirements from tox.ini to requirements.txt

[sqlconvert.git] / tox.ini

diff --git a/tox.ini b/tox.ini
index 7d25d514217d7001ada11703fea505d486d3d1f9..0e276dcb340e5fe6d82b14eac08fae148403f404 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -4,15 +4,16 @@ envlist = {py26,py27,py34,py35,py36},{py26,py27,py34,py35,py36}-{postgres,sqlite
 
 # Base test environment settings
 [testenv]
+basepython =
+    py27: {env:TOXPYTHON:python2.7}
+    py34: {env:TOXPYTHON:python3.4}
+    py35: {env:TOXPYTHON:python3.5}
+    py36: {env:TOXPYTHON:python3.6}
+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
@@ -20,15 +21,14 @@ whitelist_externals =
     flake8
     createdb
     dropdb
-    cmp
-    rm
 
 [general]
 commands =
+    {[testenv]commands}
     {envpython} -m pytest --cov=sqlconvert
-    mysql2sql demo/demo.sql test.out
-    cmp -s tests/mysql2sql/test.out test.out
-    rm test.out
+    {envpython} {envbindir}/mysql2sql -P demo/demo.sql test.out
+    {envpython} {envbindir}/cmp.py -i tests/mysql2sql/test.out test.out
+    {envpython} {envbindir}/rm.py test.out
 
 [testenv:py26]
 commands = {[general]commands}
@@ -48,6 +48,7 @@ commands = {[general]commands}
 # PostgreSQL test environments
 [postgresql]
 commands =
+    {[testenv]commands}
     -dropdb test
     createdb test
     {envpython} -m pytest --cov=sqlconvert -D postgres:///test
@@ -71,8 +72,10 @@ commands = {[postgresql]commands}
 # SQLite test environments
 [sqlite]
 commands =
+    {[testenv]commands}
+    -{envpython} {envbindir}/rm.py /tmp/test.sqdb
     {envpython} -m pytest --cov=sqlconvert -D sqlite:///tmp/test.sqdb
-    rm -f /tmp/test.sqdb
+    {envpython} {envbindir}/rm.py /tmp/test.sqdb
 
 [testenv:py26-sqlite]
 commands = {[sqlite]commands}
@@ -93,9 +96,13 @@ commands = {[sqlite]commands}
 [testenv:py27-flake8]
 deps =
     flake8
-commands = flake8
+commands =
+    {[testenv]commands}
+    flake8
 
 [testenv:py34-flake8]
 deps =
     flake8
-commands = flake8
+commands =
+    {[testenv]commands}
+    flake8