From 125dec493e214d3d3f0d3ad540a55832a6ecef97 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sun, 26 Apr 2020 15:01:56 +0300
Subject: [PATCH] Modify tox envs to simplify CI and add Python 3.8

---
 .github/workflows/main.yml | 9 +++------
 .travis.yml                | 6 +++---
 tox.ini                    | 9 +++++----
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c2161ec2..bcbd94d4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,19 +17,16 @@ jobs:
         config:
           - os: ubuntu
             python: 3.5
-            tox: py35
           - os: ubuntu
             python: 3.6
-            tox: py36
           - os: ubuntu
             python: 3.7
-            tox: py37
+          - os: ubuntu
+            python: 3.8
           - os: macos
             python: 3.7
-            tox: py37
           - os: windows
             python: 3.7
-            tox: py37
 
     steps:
       - uses: actions/checkout@v2
@@ -77,7 +74,7 @@ jobs:
           echo "=====  PANDOC  ====="
           pandoc --version | head -2
       - name: Run tests
-        run: tox -e ${{ matrix.config.tox }}
+        run: tox -e py${{ matrix.config.python }}
 
 
   lint:
diff --git a/.travis.yml b/.travis.yml
index af3a6ca8..c0637a7f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,15 +11,15 @@ env:
   matrix:
     - TOX_ENV=docs
     - TOX_ENV=flake8
-    - TOX_ENV=py35
-    - TOX_ENV=py36
+    - TOX_ENV=py3.5
+    - TOX_ENV=py3.6
 matrix:
   include:
     - python: 3.7
       sudo: true
       dist: xenial
       env:
-      - TOX_ENV=py37
+      - TOX_ENV=py3.7
 addons:
   apt_packages:
     - pandoc
diff --git a/tox.ini b/tox.ini
index 23bb518f..6cc34498 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,12 @@
 [tox]
-envlist = py{35,36,37},docs,flake8
+envlist = py{3.5,3.6,3.7,3.8},docs,flake8
 
 [testenv]
 basepython =
-    py35: python3.5
-    py36: python3.6
-    py37: python3.7
+    py3.5: python3.5
+    py3.6: python3.6
+    py3.7: python3.7
+    py3.8: python3.8
 passenv = *
 usedevelop=True
 deps =