Merge branch 'master' of github.com:giampaolo/psutil

giampaolo · Nov 20, 2019 · 5cb1b0b · 5cb1b0b
2 parents 0aeb769 + b316e6a
commit 5cb1b0b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,7 @@ matrix:
         - python: 3.5
         - python: 3.6
         - python: 3.7
-          dist: xenial
+        - python: 3.8
         # pypy
         # - python: pypy
         # - python: pypy3

diff --git a/appveyor.yml b/appveyor.yml
@@ -27,6 +27,10 @@ environment:
       PYTHON_VERSION: "3.7.x"
       PYTHON_ARCH: "32"
 
+    - PYTHON: "C:\\Python38"
+      PYTHON_VERSION: "3.8.x"
+      PYTHON_ARCH: "32"
+
     # 64 bits
 
     - PYTHON: "C:\\Python27-x64"
@@ -45,6 +49,10 @@ environment:
       PYTHON_VERSION: "3.7.x"
       PYTHON_ARCH: "64"
 
+    - PYTHON: "C:\\Python38-x64"
+      PYTHON_VERSION: "3.8.x"
+      PYTHON_ARCH: "64"
+
 init:
   - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%"
 

diff --git a/tox.ini b/tox.ini
@@ -5,7 +5,7 @@
 # directory.
 
 [tox]
-envlist = py26, py27, py34, py35, py36, py37, lint
+envlist = py26, py27, py34, py35, py36, py37, py38, lint
 
 [testenv]
 deps =