Skip to content

Commit f761b64

Browse files
authored
tests: expand Python versions to 3.9 and 3.10
Also updated those Python versions: - 3.5.8 -> 3.5.10 - 3.6.9 -> 3.6.12 - 3.7.5 -> 3.7.9 - 3.8.0 -> 3.8.6
1 parent 87a8f49 commit f761b64

File tree

5 files changed

+76
-57
lines changed

5 files changed

+76
-57
lines changed

.travis.yml

Lines changed: 45 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,42 +26,68 @@ jobs:
2626
os: osx
2727
language: shell
2828
install:
29+
- unset PYENV_ROOT
30+
- curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
31+
- export PATH="$HOME/.pyenv/bin:$PATH"
2932
- eval "$(pyenv init -)"
30-
- pyenv install --skip-existing 3.5.8
31-
- pyenv global 3.5.8
33+
- pyenv install --skip-existing 3.5.10
34+
- pyenv global 3.5.10
3235
env: TOXENV=py35
3336
- name: Python 3.6 on macOS
3437
os: osx
3538
language: shell
3639
install:
40+
- unset PYENV_ROOT
41+
- curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
42+
- export PATH="$HOME/.pyenv/bin:$PATH"
3743
- eval "$(pyenv init -)"
38-
- pyenv install --skip-existing 3.6.9
39-
- pyenv global system 3.6.9
44+
- pyenv install --skip-existing 3.6.12
45+
- pyenv global system 3.6.12
4046
env: TOXENV=py36
4147
- name: Python 3.7 on macOS
4248
os: osx
4349
language: shell
4450
install:
51+
- unset PYENV_ROOT
52+
- curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
53+
- export PATH="$HOME/.pyenv/bin:$PATH"
4554
- eval "$(pyenv init -)"
46-
- pyenv install --skip-existing 3.7.5
47-
- pyenv global system 3.7.5
55+
- pyenv install --skip-existing 3.7.9
56+
- pyenv global system 3.7.9
4857
env: TOXENV=py37
4958
- name: Python 3.8 on macOS
5059
os: osx
5160
language: shell
5261
install:
62+
- unset PYENV_ROOT
63+
- curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
64+
- export PATH="$HOME/.pyenv/bin:$PATH"
5365
- eval "$(pyenv init -)"
54-
- pyenv install --skip-existing 3.8.0
55-
- pyenv global system 3.8.0
66+
- pyenv install --skip-existing 3.8.6
67+
- pyenv global system 3.8.6
5668
env: TOXENV=py38
57-
# - name: Python 3.9 on macOS
58-
# os: osx
59-
# language: shell
60-
# install:
61-
# - eval "$(pyenv init -)"
62-
# - pyenv install --skip-existing 3.9-dev
63-
# - pyenv global system 3.9-dev
64-
# env: TOXENV=py39
69+
- name: Python 3.9 on macOS
70+
os: osx
71+
language: shell
72+
install:
73+
- unset PYENV_ROOT
74+
- curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
75+
- export PATH="$HOME/.pyenv/bin:$PATH"
76+
- eval "$(pyenv init -)"
77+
- pyenv install --skip-existing 3.9-dev
78+
- pyenv global system 3.9-dev
79+
env: TOXENV=py39
80+
- name: Python 3.10 on macOS
81+
os: osx
82+
language: shell
83+
install:
84+
- unset PYENV_ROOT
85+
- curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
86+
- export PATH="$HOME/.pyenv/bin:$PATH"
87+
- eval "$(pyenv init -)"
88+
- pyenv install --skip-existing 3.10-dev
89+
- pyenv global system 3.10-dev
90+
env: TOXENV=py310
6591
- name: PyPy 3.6 on GNU/Linux
6692
python: pypy3
6793
env: TOXENV=pypy3
@@ -80,9 +106,9 @@ jobs:
80106
- name: Python 3.9 on GNU/Linux
81107
python: 3.9-dev
82108
env: TOXENV=py39
83-
# - name: Python 3.10 on GNU/Linux
84-
# python: nightly
85-
# env: TOXENV=py310
109+
- name: Python 3.10 on GNU/Linux
110+
python: nightly
111+
env: TOXENV=py310
86112

87113
addons:
88114
apt:

CHANGELOG

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ History:
66
- MSS: reworked how C functions are initialised
77
- Mac: reduce the number of function calls
88
- Mac: support macOS Big Sur (fixes #178)
9+
- tests: expand Python versions to 3.9 and 3.10
910
- tests: fix macOS intepreter not found on Travis-CI
1011
- tests: fix test_entry_point() when there are several monitors
1112
- :heart: contributors: @

appveyor.yml

Lines changed: 27 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,38 @@
11
build: off
22

3-
cache:
4-
- '%LOCALAPPDATA%\pip\Cache'
3+
image:
4+
- Visual Studio 2019
5+
6+
platform:
7+
- x64
8+
- x86
59

610
environment:
711
fast_finish: true
812
matrix:
9-
- python: py35
10-
tox_env: py35
11-
python_path: c:\python35
12-
- python: py35-x64
13-
tox_env: py35
14-
python_path: c:\python35-x64
15-
- python: py36
16-
tox_env: py36
17-
python_path: c:\python36
18-
- python: py36-x64
19-
tox_env: py36
20-
python_path: c:\python36-x64
21-
- python: py37
22-
tox_env: py37
23-
python_path: c:\python37
24-
- python: py37-x64
25-
tox_env: py37
26-
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
33-
- python: py39
34-
tox_env: py39
35-
python_path: c:\python39
36-
- python: py39-x64
37-
tox_env: py39
38-
python_path: c:\python39-x64
13+
- PYTHON_VERSION: 3.10
14+
- PYTHON_VERSION: 3.9
15+
- PYTHON_VERSION: 3.8
16+
- PYTHON_VERSION: 3.7
17+
- PYTHON_VERSION: 3.6
18+
- PYTHON_VERSION: 3.5
19+
20+
matrix:
21+
allow_failures:
22+
- PYTHON_VERSION: 3.10
23+
- PYTHON_VERSION: 3.9
24+
25+
init:
26+
# Update Environment Variables based on matrix/platform
27+
- set PY_VER=%PYTHON_VERSION:.=%
28+
- set PYTHON=C:\PYTHON%PY_VER%
29+
- if %PLATFORM%==x64 (set PYTHON=%PYTHON%-x64)
30+
31+
# Put desired Python version first in PATH
32+
- set PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%
3933

4034
install:
41-
- python -m pip install virtualenv
42-
- python -m virtualenv env
43-
- env\Scripts\activate.bat
4435
- python -m pip install --upgrade pip tox
4536

4637
test_script:
47-
tox -e %tox_env%
38+
- tox -e py%PY_VER%

mss/tests/test_third_party.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111

1212
try:
1313
import numpy
14-
except ImportError:
14+
except (ImportError, RuntimeError):
15+
# RuntimeError on Python 3.9 (macOS): Polyfit sanity test emitted a warning, ...
1516
numpy = None
1617

1718
try:

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ deps =
1313
pytest
1414
# Must pin that version to support PyPy3
1515
pypy3: numpy==1.15.4
16-
py3{10,9,8,7,6,5}: numpy
16+
py3{9,8,7,6,5}: numpy
1717
pillow
1818
wheel
1919
commands =

0 commit comments

Comments
 (0)