summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2019-11-20 14:13:17 +0800
committerGiampaolo Rodola <g.rodola@gmail.com>2019-11-20 14:13:17 +0800
commit5cb1b0b526765720253fdb2e8eff0bf380bbe0a8 (patch)
tree8c58a79e0d953033af685953ee386bb1ddec6d07
parent0aeb7697be98017c23736328a5debc38d172e1c7 (diff)
parentb316e6ae32870e3c69ff06ff13097788ee4d250c (diff)
downloadpsutil-5cb1b0b526765720253fdb2e8eff0bf380bbe0a8.tar.gz
Merge branch 'master' of github.com:giampaolo/psutil
-rw-r--r--.travis.yml2
-rw-r--r--appveyor.yml8
-rw-r--r--tox.ini2
3 files changed, 10 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 97533144..ced00a09 100644
--- 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
index 38a6a8e0..a99670e3 100644
--- 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
index 947fbeda..2698eb6a 100644
--- 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 =