X-Git-Url: https://git.phdru.name/?p=sqlconvert.git;a=blobdiff_plain;f=tox.ini;h=150c8b79dceae165a8ef8ff275788d5636bc3995;hp=5897033dc7fc48a2352e3abf1a6206485bf3ab68;hb=96ec2fdc1e551d98d78ec9bd3aa8ef997063dc4b;hpb=384eb1bae27664921eca6659c96f2d18663cadf5

diff --git a/tox.ini b/tox.ini
index 5897033..150c8b7 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 = py27,py3{4,5,6,7,8}{,-sqlite},py{27,38}-flake8
 
 # Base test environment settings
 [testenv]
@@ -9,20 +9,21 @@ basepython =
     py34: {env:TOXPYTHON:python3.4}
     py35: {env:TOXPYTHON:python3.5}
     py36: {env:TOXPYTHON:python3.6}
+    py37: {env:TOXPYTHON:python3.7}
+    py38: {env:TOXPYTHON:python3.8}
 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 =
+    cmd
     createdb
     dropdb
-    cmp.py
-    rm.py
 
 [general]
 commands =
@@ -44,6 +45,12 @@ commands = {[general]commands}
 [testenv:py36]
 commands = {[general]commands}
 
+[testenv:py37]
+commands = {[general]commands}
+
+[testenv:py38]
+commands = {[general]commands}
+
 # PostgreSQL test environments
 [postgresql]
 commands =
@@ -65,6 +72,12 @@ commands = {[postgresql]commands}
 [testenv:py36-postgres]
 commands = {[postgresql]commands}
 
+[testenv:py37-postgres]
+commands = {[postgresql]commands}
+
+[testenv:py38-postgres]
+commands = {[postgresql]commands}
+
 [postgres-w32]
 platform = win32
 commands =
@@ -90,6 +103,17 @@ commands = {[postgres-w32]commands}
 platform = win32
 commands = {[postgres-w32]commands}
 
+[testenv:py37-postgres-w32]
+platform = win32
+commands =
+    cmd /c "copy devscripts\\CI\\validators.py {envsitepackagesdir}\\formencode\\validators.py"
+    {[postgres-w32]commands}
+
+[testenv:py38-postgres-w32]
+platform = win32
+commands =
+    {[postgres-w32]commands}
+
 # SQLite test environments
 [sqlite]
 commands =
@@ -110,6 +134,12 @@ commands = {[sqlite]commands}
 [testenv:py36-sqlite]
 commands = {[sqlite]commands}
 
+[testenv:py37-sqlite]
+commands = {[sqlite]commands}
+
+[testenv:py38-sqlite]
+commands = {[sqlite]commands}
+
 [sqlite-w32]
 platform = win32
 commands =
@@ -130,6 +160,21 @@ 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 =
+    cmd /c "copy validators.py {envsitepackagesdir}\\formencode\\validators.py"
+    {[sqlite-w32]commands}
+
+[testenv:py38-sqlite-w32]
+platform = win32
+commands =
+    {[sqlite-w32]commands}
+
 # flake8
 [testenv:py27-flake8]
 deps =
@@ -138,7 +183,7 @@ commands =
     {[testenv]commands}
     flake8
 
-[testenv:py34-flake8]
+[testenv:py38-flake8]
 deps =
     flake8
 commands =