Merge branch 'py38' into 'master'

Cleanup CI and add python 3.8 support

See merge request pycqa/flake8!377

5 files changed, 12 insertions, 5 deletions

diff --git a/.appveyor.yml b/.appveyor.yml
index dc5f334..47cc8d6 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -5,4 +5,4 @@ install:
 build: off
 
 test_script:
-  - python -m tox -e py27,py34,py35,dogfood
+  - python -m tox -e py27,py36,py37,dogfood
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cbccb83..518c3b3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,8 +39,13 @@ python37:
   stage: test
   script: tox -e py37
 
+python38:
+  image: python:3.8
+  stage: test
+  script: tox -e py38
+
 linters:
-  image: python:3.6
+  image: python:3.7
   stage: test
   script: tox -e linters
 
diff --git a/.travis.yml b/.travis.yml
index 7e7f997..572bc42 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,3 @@
-dist: xenial
 language: python
 cache: pip
 before_script:
@@ -22,9 +21,11 @@ matrix:
       env: TOXENV=py36
     - python: 3.7
       env: TOXENV=py37
+    - python: 3.8
+      env: TOXENV=py38
     - python: pypy
       env: TOXENV=pypy
-    - python: 2.7
+    - python: 3.7
       env: TOXENV=readme
     - python: 3.7
       env: TOXENV=flake8
diff --git a/setup.cfg b/setup.cfg
index 55b291e..a83dce8 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -27,6 +27,7 @@ classifiers =
     Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
     Topic :: Software Development :: Libraries :: Python Modules
     Topic :: Software Development :: Quality Assurance
 
diff --git a/tox.ini b/tox.ini
index d4c4fec..ad533f4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion=2.3.1
-envlist = py27,py34,py35,py36,py37,flake8,linters,docs
+envlist = py27,py34,py35,py36,py37,py38,flake8,linters,docs
 
 [testenv]
 deps =