Skip to content

Commit

Permalink
Merge branch 'master' of github.com:giampaolo/psutil
Browse files Browse the repository at this point in the history
  • Loading branch information
giampaolo committed Nov 20, 2019
2 parents 0aeb769 + b316e6a commit 5cb1b0b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ matrix:
- python: 3.5
- python: 3.6
- python: 3.7
dist: xenial
- python: 3.8
# pypy
# - python: pypy
# - python: pypy3
Expand Down
8 changes: 8 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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%"

Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down

0 comments on commit 5cb1b0b

Please sign in to comment.