Skip to content

Commit 044730e

Browse files
committed
Tests: Add Python 3.8 to the CI
Also: - Exanded the tests matrix: PyPy 3.6, Python 3.5 and 3.6 on macOS. - Arranged the tests matrix to run macOS tests first as they tend to take way more time. - Use Python 3.8 for lint, types and docs tox env. - Added the Python 3.8 classifier. - Added the AppVeyor badge on the README.
1 parent 38d0395 commit 044730e

File tree

5 files changed

+61
-20
lines changed

5 files changed

+61
-20
lines changed

.travis.yml

Lines changed: 47 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,66 @@ dist: xenial
44
matrix:
55
fast_finish: true
66
include:
7-
- os: linux
8-
python: "3.7"
7+
- name: Code quality checks
8+
os: linux
9+
python: "3.8"
910
env: TOXENV=lint
10-
- os: linux
11-
python: "3.7"
11+
- name: Types checking
12+
os: linux
13+
python: "3.8"
1214
env: TOXENV=types
13-
- os: linux
14-
python: "3.7"
15+
- name: Documentation build
16+
os: linux
17+
python: "3.8"
1518
env: TOXENV=docs
1619
- os: osx
17-
language: generic
20+
language: shell
21+
before_install:
22+
- bash .travis/install.sh
23+
env:
24+
- PYTHON_VERSION=3.5
25+
- TOXENV=py35
26+
- name: "Python 3.6 on macOS 10.13"
27+
os: osx
28+
osx_image: xcode9.4 # Python 3.6.5 running on macOS 10.13
29+
language: shell
30+
env:
31+
- PYTHON_VERSION=3.6
32+
- TOXENV=py36
33+
- name: "Python 3.7 on macOS 10.14"
34+
os: osx
35+
osx_image: xcode10.2 # Python 3.7.3 running on macOS 10.14.3
36+
language: shell
1837
env:
1938
- PYTHON_VERSION=3.7
2039
- TOXENV=py37
21-
- os: linux
40+
- os: osx
41+
language: shell
42+
before_install:
43+
- bash .travis/install.sh
44+
env:
45+
- PYTHON_VERSION=3.8
46+
- TOXENV=py38
47+
- name: "PyPy 3.6 on GNU/Linux"
48+
os: linux
49+
python: "pypy3"
50+
env: TOXENV=pypy3
51+
- name: "Python 3.5 on GNU/Linux"
52+
os: linux
2253
python: "3.5"
2354
env: TOXENV=py35
24-
- os: linux
55+
- name: "Python 3.6 on GNU/Linux"
56+
os: linux
2557
python: "3.6"
2658
env: TOXENV=py36
27-
- os: linux
59+
- name: "Python 3.7 on GNU/Linux"
60+
os: linux
2861
python: "3.7"
2962
env: TOXENV=py37
30-
- os: linux
31-
python: "pypy3.5"
32-
env: TOXENV=pypy3
63+
- name: "Python 3.8 on GNU/Linux"
64+
os: linux
65+
python: "3.8"
66+
env: TOXENV=py38
3367

3468
addons:
3569
apt:
@@ -39,9 +73,6 @@ addons:
3973
services:
4074
- xvfb
4175

42-
before_install:
43-
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then bash .travis/install.sh; fi
44-
4576
install:
4677
- python -m pip install --upgrade pip tox
4778

README.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ Python MSS
33

44
.. image:: https://travis-ci.org/BoboTiG/python-mss.svg?branch=master
55
:target: https://travis-ci.org/BoboTiG/python-mss
6+
.. image:: https://ci.appveyor.com/api/projects/status/72dik18r6b746mb0?svg=true
7+
:target: https://ci.appveyor.com/project/BoboTiG/python-mss
68
.. image:: https://img.shields.io/badge/say-thanks-ff69b4.svg
79
:target: https://saythanks.io/to/BoboTiG
810
.. image:: https://pepy.tech/badge/mss

appveyor.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ environment:
2424
- python: py37-x64
2525
tox_env: py37
2626
python_path: c:\python37-x64
27+
- python: py38
28+
tox_env: py38
29+
python_path: c:\python38
30+
- python: py38-x64
31+
tox_env: py38
32+
python_path: c:\python38-x64
2733

2834
install:
2935
- python -m pip install virtualenv

setup.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ classifiers =
2323
Programming Language :: Python :: 3.5
2424
Programming Language :: Python :: 3.6
2525
Programming Language :: Python :: 3.7
26+
Programming Language :: Python :: 3.8
2627
Programming Language :: Python :: 3 :: Only
2728
Topic :: Multimedia :: Graphics :: Capture :: Screen Capture
2829
Topic :: Software Development :: Libraries

tox.ini

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,24 @@ envlist =
33
lint
44
types
55
docs
6-
py{37,36,35,py3}
6+
py{38,37,36,35,py3}
77
skip_missing_interpreters = True
88

99
[testenv]
1010
passenv = DISPLAY
1111
alwayscopy = True
1212
deps =
13-
pytest>=4.0.2
13+
pytest
14+
# Must pin that version to support PyPy3
1415
numpy==1.15.4
15-
py37: pillow>=5.4.0
16+
pillow
1617
commands =
1718
python -m pytest {posargs}
1819

1920
[testenv:lint]
2021
description = Code quality check
2122
deps =
22-
flake8>=3.6.0
23+
flake8
2324
pylint
2425
commands =
2526
python -m flake8 docs mss tests

0 commit comments

Comments
 (0)