Skip to content

Commit 5cb1b0b

Browse files
committed
Merge branch 'master' of github.com:giampaolo/psutil
2 parents 0aeb769 + b316e6a commit 5cb1b0b

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ matrix:
1515
- python: 3.5
1616
- python: 3.6
1717
- python: 3.7
18-
dist: xenial
18+
- python: 3.8
1919
# pypy
2020
# - python: pypy
2121
# - python: pypy3

appveyor.yml

+8
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ environment:
2727
PYTHON_VERSION: "3.7.x"
2828
PYTHON_ARCH: "32"
2929

30+
- PYTHON: "C:\\Python38"
31+
PYTHON_VERSION: "3.8.x"
32+
PYTHON_ARCH: "32"
33+
3034
# 64 bits
3135

3236
- PYTHON: "C:\\Python27-x64"
@@ -45,6 +49,10 @@ environment:
4549
PYTHON_VERSION: "3.7.x"
4650
PYTHON_ARCH: "64"
4751

52+
- PYTHON: "C:\\Python38-x64"
53+
PYTHON_VERSION: "3.8.x"
54+
PYTHON_ARCH: "64"
55+
4856
init:
4957
- "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%"
5058

tox.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# directory.
66

77
[tox]
8-
envlist = py26, py27, py34, py35, py36, py37, lint
8+
envlist = py26, py27, py34, py35, py36, py37, py38, lint
99

1010
[testenv]
1111
deps =

0 commit comments

Comments
 (0)