From 96ec2fdc1e551d98d78ec9bd3aa8ef997063dc4b Mon Sep 17 00:00:00 2001
From: Oleg Broytman <phd@phdru.name>
Date: Wed, 26 Feb 2020 00:56:33 +0300
Subject: [PATCH] Tests: Run tests with Python 3.8

---
 .travis.yml  | 10 ++++++++--
 appveyor.yml | 19 ++++++++++++++++---
 setup.py     |  1 +
 tox.ini      | 24 ++++++++++++++++++++++--
 4 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a6df112..1d1cdf6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,8 @@ matrix:
     env: TOXENV=py36
   - python: "3.7"
     env: TOXENV=py37
+  - python: "3.8"
+    env: TOXENV=py38
   - python: "2.7"
     env: TOXENV=py27-postgres
   - python: "3.4"
@@ -38,6 +40,8 @@ matrix:
     env: TOXENV=py36-postgres
   - python: "3.7"
     env: TOXENV=py37-postgres
+  - python: "3.8"
+    env: TOXENV=py38-postgres
   - python: "2.7"
     env: TOXENV=py27-sqlite
   - python: "3.4"
@@ -48,10 +52,12 @@ matrix:
     env: TOXENV=py36-sqlite
   - python: "3.7"
     env: TOXENV=py37-sqlite
+  - python: "3.8"
+    env: TOXENV=py38-sqlite
   - python: "2.7"
     env: TOXENV=py27-flake8
-  - python: "3.7"
-    env: TOXENV=py37-flake8
+  - python: "3.8"
+    env: TOXENV=py38-flake8
 
 install:
   - travis_retry pip install --upgrade "pip < 19.1" setuptools tox ppu
diff --git a/appveyor.yml b/appveyor.yml
index 34cc57e..8895632 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,6 +24,10 @@ environment:
       PYTHON_VERSION: "3.7"
       PYTHON_ARCH: "64"
       PYTHON_HOME: "C:\\Python37-x64"
+    - TOXENV: "py38"
+      PYTHON_VERSION: "3.8"
+      PYTHON_ARCH: "64"
+      PYTHON_HOME: "C:\\Python38-x64"
     - TOXENV: "py27-postgres-w32"
       PYTHON_VERSION: "2.7"
       PYTHON_ARCH: "32"
@@ -34,6 +38,11 @@ environment:
       PYTHON_ARCH: "64"
       PYTHON_HOME: "C:\\Python37-x64"
       db: postgresql
+    - TOXENV: "py38-postgres-w32"
+      PYTHON_VERSION: "3.8"
+      PYTHON_ARCH: "64"
+      PYTHON_HOME: "C:\\Python38-x64"
+      db: postgresql
     - TOXENV: "py27-sqlite-w32"
       PYTHON_VERSION: "2.7"
       PYTHON_ARCH: "32"
@@ -42,14 +51,18 @@ environment:
       PYTHON_VERSION: "3.7"
       PYTHON_ARCH: "64"
       PYTHON_HOME: "C:\\Python37-x64"
+    - TOXENV: "py38-sqlite-w32"
+      PYTHON_VERSION: "3.8"
+      PYTHON_ARCH: "64"
+      PYTHON_HOME: "C:\\Python38-x64"
     - TOXENV: "py27-flake8"
       PYTHON_VERSION: "2.7"
       PYTHON_ARCH: "32"
       PYTHON_HOME: "C:\\Python27"
-    - TOXENV: "py37-flake8"
-      PYTHON_VERSION: "3.7"
+    - TOXENV: "py38-flake8"
+      PYTHON_VERSION: "3.8"
       PYTHON_ARCH: "64"
-      PYTHON_HOME: "C:\\Python37-x64"
+      PYTHON_HOME: "C:\\Python38-x64"
 
 install:
   # Ensure we use the right python version
diff --git a/setup.py b/setup.py
index 112c2e9..6d0632c 100755
--- a/setup.py
+++ b/setup.py
@@ -51,6 +51,7 @@ setup(
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
     ],
     packages=['sqlconvert'],
     scripts=['scripts/mysql2sql'],
diff --git a/tox.ini b/tox.ini
index 78de300..150c8b7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = py{27,34,35,36,37}{,-sqlite},py{27,37}-flake8
+envlist = py27,py3{4,5,6,7,8}{,-sqlite},py{27,38}-flake8
 
 # Base test environment settings
 [testenv]
@@ -10,6 +10,7 @@ basepython =
     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)"
@@ -47,6 +48,9 @@ commands = {[general]commands}
 [testenv:py37]
 commands = {[general]commands}
 
+[testenv:py38]
+commands = {[general]commands}
+
 # PostgreSQL test environments
 [postgresql]
 commands =
@@ -71,6 +75,9 @@ commands = {[postgresql]commands}
 [testenv:py37-postgres]
 commands = {[postgresql]commands}
 
+[testenv:py38-postgres]
+commands = {[postgresql]commands}
+
 [postgres-w32]
 platform = win32
 commands =
@@ -102,6 +109,11 @@ 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 =
@@ -125,6 +137,9 @@ commands = {[sqlite]commands}
 [testenv:py37-sqlite]
 commands = {[sqlite]commands}
 
+[testenv:py38-sqlite]
+commands = {[sqlite]commands}
+
 [sqlite-w32]
 platform = win32
 commands =
@@ -155,6 +170,11 @@ 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 =
@@ -163,7 +183,7 @@ commands =
     {[testenv]commands}
     flake8
 
-[testenv:py37-flake8]
+[testenv:py38-flake8]
 deps =
     flake8
 commands =
-- 
2.39.5