From 7d0c8f97f8ceac8c33c52e74e2f1a64600c662d1 Mon Sep 17 00:00:00 2001
From: Bastien Vallet <b.vallet@criteo.com>
Date: Thu, 24 Oct 2019 17:19:33 +0200
Subject: [PATCH] [py38] Python 3.8 is now official, use it by default

---
 .travis.yml | 10 ++++------
 setup.py    |  1 +
 tox.ini     |  2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1d569a76c..227b004c8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ sudo: false
 language: python
 matrix:
   include:
-    - python: 3.7
+    - python: 3.8
       env: TOXENV=lint
       dist: xenial
       sudo: true
@@ -19,16 +19,14 @@ matrix:
     - python: pypy3
       env: TOXENV=pypy3
       dist: xenial
-    - python: 3.8-dev
-      env: TOXENV=py38-dev
+    - python: 3.8
+      env: TOXENV=py38
       dist: xenial
       sudo: true
-    - python: 3.7
+    - python: 3.8
       env: TOXENV=docs-lint
       dist: xenial
       sudo: true
-  allow_failures:
-    - env: TOXENV=py38-dev
 install: pip install tox
 # TODO: https://github.com/tox-dev/tox/issues/149
 script: tox --recreate
diff --git a/setup.py b/setup.py
index 8d79fb7a5..2408a53f6 100644
--- a/setup.py
+++ b/setup.py
@@ -25,6 +25,7 @@
     'Programming Language :: Python :: 3.5',
     'Programming Language :: Python :: 3.6',
     'Programming Language :: Python :: 3.7',
+    'Programming Language :: Python :: 3.8',
     'Programming Language :: Python :: 3 :: Only',
     'Programming Language :: Python :: Implementation :: CPython',
     'Programming Language :: Python :: Implementation :: PyPy',
diff --git a/tox.ini b/tox.ini
index 96388fa74..7180e559b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py34, py35, py36, py37, py38-dev, pypy3, lint
+envlist = py34, py35, py36, py37, py38, pypy3, lint
 skipsdist = True
 
 [testenv]