From ec41070d3fa1d00cb272f86e0c8ca55db51bdf62 Mon Sep 17 00:00:00 2001
From: Petr Viktorin <pviktori@redhat.com>
Date: Sat, 14 Jul 2018 10:54:23 +0200
Subject: [PATCH] Add Python 3.8-dev to Tox config

---
 .travis.yml | 18 ++++++++++++++++--
 tox.ini     |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9ce0cdf..8146639 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,6 +39,13 @@ matrix:
         - WITH_GCOV=1
       dist: xenial
       sudo: true
+    - python: 3.8-dev
+      env:
+        - TOXENV=py38
+        - CFLAGS_std="-std=c99"
+        - WITH_GCOV=1
+      dist: xenial
+      sudo: true
     - python: 2.7
       env:
         - TOXENV=py2-nosasltls
@@ -53,6 +60,10 @@ matrix:
     - python: 3.6
       env: TOXENV=doc
   allow_failures:
+     - env:
+        - TOXENV=py38
+        - CFLAGS_std="-std=c99"
+        - WITH_GCOV=1
      - env:
         - TOXENV=pypy
 
@@ -61,7 +72,10 @@ env:
         # -Wno-int-in-bool-context: don't complain about PyMem_MALLOC()
         # -Werror: turn all warnings into fatal errors
         # -Werror=declaration-after-statement: strict ISO C90
-        - CFLAGS="-std=c90 -Wno-int-in-bool-context -Werror -Werror=declaration-after-statement"
+        - CFLAGS_warnings="-Wno-int-in-bool-context -Werror -Werror=declaration-after-statement"
+        # Keep C90 compatibility where possible.
+        # (Python 3.8+ headers use C99 features, so this needs to be overridable.)
+        - CFLAGS_std="-std=c90"
         # pass CFLAGS, CI (for Travis CI) and WITH_GCOV to tox tasks
         - TOX_TESTENV_PASSENV="CFLAGS CI WITH_GCOV"
 
@@ -69,7 +83,7 @@ install:
   - pip install "pip>=7.1.0"
   - pip install tox-travis tox codecov coverage
 
-script: tox
+script: CFLAGS="$CFLAGS_warnings $CFLAGS_std" tox
 
 after_success:
   # gather Python coverage
diff --git a/tox.ini b/tox.ini
index 7dee491..1434ba0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@
 
 [tox]
 # Note: when updating Python versions, also change setup.py and .travis.yml
-envlist = py27,py34,py35,py36,py37,{py2,py3}-nosasltls,doc,py3-trace,coverage-report
+envlist = py27,py34,py35,py36,py37,py38,{py2,py3}-nosasltls,doc,py3-trace,coverage-report
 minver = 1.8
 
 [testenv]