Merge branch 'master' into dependabot/pip/pytest-xdist-1.32.0

BradenM · Jun 19, 2020 · ac03664 · ac03664
2 parents d6370a3 + 5c81b78
commit ac03664
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -11,7 +11,7 @@ jobs:
         strategy:
             matrix:
                 os: [windows-latest, macOS-10.14, ubuntu-18.04]
-                python: ["3.6", "3.7"]
+                python: ["3.6", "3.7", "3.8"]
 
         steps:
             - uses: actions/checkout@v2.1.0

diff --git a/.python-version b/.python-version
@@ -1,2 +1,3 @@
-3.7.3
-3.6.8
+3.8.3
+3.7.7
+3.6.10
diff --git a/tox.ini b/tox.ini
@@ -1,14 +1,16 @@
 [tox]
 isolated_build = true
-envlist = py36, py37, flake8
+envlist = py36, py37, py38, flake8
 
 [travis]
 python =
+    3.8: py38
     3.7: py37
     3.6: py36
 
 [gh-actions]
 python =
+    3.8: py38
     3.7: py37
     3.6: py36