Skip to content

Commit 44f7e54

Browse files
Mickaël SchoentgenBoboTiG
authored andcommitted
tests: fix macOS intepreter not found on Travis-CI
1 parent d6a229b commit 44f7e54

File tree

4 files changed

+60
-85
lines changed

4 files changed

+60
-85
lines changed

.travis.yml

Lines changed: 57 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,88 @@
1+
# Beta opt-in
2+
# https://docs.travis-ci.com/user/build-config-validation#beta-opt-in
3+
version: ~> 1.0
4+
15
language: python
26
dist: xenial
7+
os: linux
8+
9+
env:
10+
global:
11+
- MAKEFLAGS="-j 2"
312

4-
matrix:
13+
jobs:
514
fast_finish: true
615
include:
716
- name: Code quality checks
8-
os: linux
917
python: "3.8"
1018
env: TOXENV=lint
1119
- name: Types checking
12-
os: linux
1320
python: "3.8"
1421
env: TOXENV=types
1522
- name: Documentation build
16-
os: linux
1723
python: "3.8"
1824
env: TOXENV=docs
19-
- os: osx
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"
25+
- name: Python 3.5 on macOS
2726
os: osx
28-
osx_image: xcode9.4 # Python 3.6.5 running on macOS 10.13
2927
language: shell
30-
env:
31-
- PYTHON_VERSION=3.6
32-
- TOXENV=py36
33-
- name: "Python 3.7 on macOS 10.14"
28+
install:
29+
- eval "$(pyenv init -)"
30+
- pyenv install --skip-existing 3.5.8
31+
- pyenv global 3.5.8
32+
env: TOXENV=py35
33+
- name: Python 3.6 on macOS
3434
os: osx
35-
osx_image: xcode11.2 # Python 3.7.4 running on macOS 10.14.4
3635
language: shell
37-
env:
38-
- PYTHON_VERSION=3.7
39-
- TOXENV=py37
40-
- name: "Python 3.8 on macOS 10.14"
36+
install:
37+
- eval "$(pyenv init -)"
38+
- pyenv install --skip-existing 3.6.9
39+
- pyenv global system 3.6.9
40+
env: TOXENV=py36
41+
- name: Python 3.7 on macOS
4142
os: osx
42-
osx_image: xcode11.3 # Python 3.8.0 running on macOS 10.14.6
4343
language: shell
44-
env:
45-
- PYTHON_VERSION=3.8
46-
- TOXENV=py38
47-
- os: osx
44+
install:
45+
- eval "$(pyenv init -)"
46+
- pyenv install --skip-existing 3.7.5
47+
- pyenv global system 3.7.5
48+
env: TOXENV=py37
49+
- name: Python 3.8 on macOS
50+
os: osx
4851
language: shell
49-
before_install:
50-
- bash .travis/install.sh
51-
env:
52-
- PYTHON_VERSION=3.9
53-
- TOXENV=py39
54-
- name: "PyPy 3.6 on GNU/Linux"
55-
os: linux
56-
python: "pypy3"
52+
install:
53+
- eval "$(pyenv init -)"
54+
- pyenv install --skip-existing 3.8.0
55+
- pyenv global system 3.8.0
56+
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
65+
- name: PyPy 3.6 on GNU/Linux
66+
python: pypy3
5767
env: TOXENV=pypy3
58-
- name: "Python 3.5 on GNU/Linux"
59-
os: linux
68+
- name: Python 3.5 on GNU/Linux
6069
python: "3.5"
6170
env: TOXENV=py35
62-
- name: "Python 3.6 on GNU/Linux"
63-
os: linux
71+
- name: Python 3.6 on GNU/Linux
6472
python: "3.6"
6573
env: TOXENV=py36
66-
- name: "Python 3.7 on GNU/Linux"
67-
os: linux
74+
- name: Python 3.7 on GNU/Linux
6875
python: "3.7"
6976
env: TOXENV=py37
70-
- name: "Python 3.8 on GNU/Linux"
71-
os: linux
77+
- name: Python 3.8 on GNU/Linux
7278
python: "3.8"
7379
env: TOXENV=py38
74-
- name: "Python 3.9 on GNU/Linux"
75-
os: linux
76-
python: "nightly"
80+
- name: Python 3.9 on GNU/Linux
81+
python: 3.9-dev
7782
env: TOXENV=py39
83+
# - name: Python 3.10 on GNU/Linux
84+
# python: nightly
85+
# env: TOXENV=py310
7886

7987
addons:
8088
apt:
@@ -84,8 +92,8 @@ addons:
8492
services:
8593
- xvfb
8694

87-
install:
88-
- python -m pip install --upgrade pip tox
95+
before_script:
96+
- python3 -m pip install --upgrade pip tox
8997

9098
script:
91-
- tox
99+
- python3 -m tox

.travis/install.sh

Lines changed: 0 additions & 33 deletions
This file was deleted.

CHANGELOG

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ History:
44

55
6.0.1 2020/xx/xx
66
- Mac: reduce the number of function calls
7+
- tests: fix macOS intepreter not found on Travis-CI
78
- :heart: contributors: @
89

910
6.0.0 2020/06/30

tox.ini

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ envlist =
33
lint
44
types
55
docs
6-
py{39,38,37,36,35,py3}
7-
skip_missing_interpreters = True
6+
py{310,39,38,37,36,35,py3}
87

98
[testenv]
109
passenv = DISPLAY
@@ -14,7 +13,7 @@ deps =
1413
pytest
1514
# Must pin that version to support PyPy3
1615
pypy3: numpy==1.15.4
17-
py{39,38,37,36,35}: numpy
16+
py3{10,9,8,7,6,5}: numpy
1817
pillow
1918
wheel
2019
commands =

0 commit comments

Comments
 (0)