X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=tox.ini;h=030496a40255c33fdf75cf4a9828f24721e798ec;hb=a39056dedda364b4b370cc8d54477c8407e84c14;hp=5897033dc7fc48a2352e3abf1a6206485bf3ab68;hpb=384eb1bae27664921eca6659c96f2d18663cadf5;p=sqlconvert.git

diff --git a/tox.ini b/tox.ini
index 5897033..030496a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = {py27,py34,py35,py36},{py27,py34,py35,py36}-{postgres,postgres-w32,sqlite,sqlite-w32},{py27,py34}-flake8
+envlist = py{27,34,35,36,37}{,-sqlite},py{27,37}-flake8
 
 # Base test environment settings
 [testenv]
@@ -9,20 +9,19 @@ basepython =
     py34: {env:TOXPYTHON:python3.4}
     py35: {env:TOXPYTHON:python3.5}
     py36: {env:TOXPYTHON:python3.6}
+    py37: {env:TOXPYTHON:python3.7}
 commands =
     {envpython} --version
     {envpython} -c "import struct; print(struct.calcsize('P') * 8)"
 deps =
     -rdevscripts/requirements/requirements_tests.txt
-    postgres: psycopg2
+    postgres: psycopg2-binary
 passenv = PGPASSWORD
 platform = linux
 # Don't fail or warn on uninstalled commands
 whitelist_externals =
     createdb
     dropdb
-    cmp.py
-    rm.py
 
 [general]
 commands =
@@ -44,6 +43,9 @@ commands = {[general]commands}
 [testenv:py36]
 commands = {[general]commands}
 
+[testenv:py37]
+commands = {[general]commands}
+
 # PostgreSQL test environments
 [postgresql]
 commands =
@@ -65,6 +67,9 @@ commands = {[postgresql]commands}
 [testenv:py36-postgres]
 commands = {[postgresql]commands}
 
+[testenv:py37-postgres]
+commands = {[postgresql]commands}
+
 [postgres-w32]
 platform = win32
 commands =
@@ -90,6 +95,10 @@ commands = {[postgres-w32]commands}
 platform = win32
 commands = {[postgres-w32]commands}
 
+[testenv:py37-postgres-w32]
+platform = win32
+commands = {[postgres-w32]commands}
+
 # SQLite test environments
 [sqlite]
 commands =
@@ -110,6 +119,9 @@ commands = {[sqlite]commands}
 [testenv:py36-sqlite]
 commands = {[sqlite]commands}
 
+[testenv:py37-sqlite]
+commands = {[sqlite]commands}
+
 [sqlite-w32]
 platform = win32
 commands =
@@ -130,6 +142,14 @@ commands = {[sqlite-w32]commands}
 platform = win32
 commands = {[sqlite-w32]commands}
 
+[testenv:py36-sqlite-w32]
+platform = win32
+commands = {[sqlite-w32]commands}
+
+[testenv:py37-sqlite-w32]
+platform = win32
+commands = {[sqlite-w32]commands}
+
 # flake8
 [testenv:py27-flake8]
 deps =
@@ -138,7 +158,7 @@ commands =
     {[testenv]commands}
     flake8
 
-[testenv:py34-flake8]
+[testenv:py37-flake8]
 deps =
     flake8
 commands =