From 64f567a021cc005c9a8ad5230f0fea1e3b30ad70 Mon Sep 17 00:00:00 2001
From: Bastien Vallet <bastien.vallet@gmail.com>
Date: Tue, 22 Oct 2019 23:39:01 +0200
Subject: [PATCH] Bump CI to Python 3.8 (#7008)

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

diff --git a/.travis.yml b/.travis.yml
index a4a4ed8b5..f89e77531 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,11 +21,13 @@ matrix:
       - { python: "3.7", env: DJANGO=2.2 }
       - { python: "3.7", env: DJANGO=master }
 
-      - { python: "3.7", env: TOXENV=base }
-      - { python: "3.7", env: TOXENV=lint }
-      - { python: "3.7", env: TOXENV=docs }
+      - { python: "3.8", env: DJANGO=master }
 
-      - python: "3.7"
+      - { python: "3.8", env: TOXENV=base }
+      - { python: "3.8", env: TOXENV=lint }
+      - { python: "3.8", env: TOXENV=docs }
+
+      - python: "3.8"
         env: TOXENV=dist
         script:
           - python setup.py bdist_wheel
diff --git a/setup.py b/setup.py
index 2f8dafd21..c9d6443d5 100755
--- a/setup.py
+++ b/setup.py
@@ -101,6 +101,7 @@ setup(
         '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',
         'Topic :: Internet :: WWW/HTTP',
     ],
diff --git a/tox.ini b/tox.ini
index 699ca909c..587c469b1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@ envlist =
        {py35,py36,py37}-django20,
        {py35,py36,py37}-django21
        {py35,py36,py37}-django22
-       {py36,py37}-djangomaster,
+       {py36,py37,py38}-djangomaster,
        base,dist,lint,docs,
 
 [travis:env]
@@ -44,14 +44,12 @@ deps =
         -rrequirements/requirements-optionals.txt
 
 [testenv:lint]
-basepython = python3.7
 commands = ./runtests.py --lintonly
 deps =
         -rrequirements/requirements-codestyle.txt
         -rrequirements/requirements-testing.txt
 
 [testenv:docs]
-basepython = python3.7
 skip_install = true
 commands = mkdocs build
 deps =