Skip to content

Commit

Permalink
Fix pypy on linux and handle OSX.
Browse files Browse the repository at this point in the history
  • Loading branch information
jsirois committed Dec 14, 2019
1 parent 3503c1c commit ae25c58
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ x-pyenv-shard: &x-pyenv-shard
fi
"${PYENV}" install --keep --skip-existing ${PYENV_VERSION}
"${PYENV}" global ${PYENV_VERSION}
pip install -U tox "setuptools>=36"
pip install -U tox
x-py27: &x-py27 PYENV_VERSION=2.7.15
x-py27: &x-py27 PYENV_VERSION=2.7.17

x-py37: &x-py37 PYENV_VERSION=3.7.0
x-py38: &x-py38 PYENV_VERSION=3.8.0

x-pypy: &x-pypy PYENV_VERSION=pypy2.7-6.0.0
x-pypy: &x-pypy PYENV_VERSION=pypy2.7-7.2.0

x-linux-shard: &x-linux-shard
os: linux
Expand All @@ -38,7 +38,7 @@ x-linux-27-shard: &x-linux-27-shard

x-linux-pypy-shard: &x-linux-pypy-shard
<<: *x-linux-shard
python: pypy2.7-6.0.0
python: pypy2.7-7.2.0

x-linux-38-shard: &x-linux-38-shard
<<: *x-linux-shard
Expand Down Expand Up @@ -131,14 +131,14 @@ matrix:
name: TOXENV=py27
script: tox -v -e py27

- <<: *x-osx-37-shard
name: TOXENV=py37
script: tox -v -e py37
- <<: *x-osx-38-shard
name: TOXENV=py38
script: tox -v -e py38

- <<: *x-osx-27-shard
name: TOXENV=py27-integration
script: tox -v -e py27-integration

- <<: *x-osx-37-shard
name: TOXENV=py37-integration
script: tox -v -e py37-integration
- <<: *x-osx-38-shard
name: TOXENV=py38-integration
script: tox -v -e py38-integration

0 comments on commit ae25c58

Please sign in to comment.