Commit 17c46325 authored by Jim Fulton's avatar Jim Fulton

reverting addition of osx didn't help

Adding osx back.

Also adding back -j99, in hopes of getting quicker runs and making
travis nor hate us so much.  But then, we'll probably get more
failures. Maybe the best option will be to just make test pass even
when starved. :(
parent 2e176d80
language: python language: python
sudo: false sudo: false
python: matrix:
- 2.7 include:
- 3.3 - os: linux
- 3.4 python: 2.7
- pypy - os: linux
python: 3.3
- os: linux
python: 3.4
- os: linux
python: 3.5
- os: linux
python: pypy
- os: linux
python: pypy3
- os: osx
language: generic
env: TERRYFY_PYTHON='homebrew 2'
- os: osx
language: generic
env: TERRYFY_PYTHON='macpython 3.4'
- os: osx
language: generic
env: TERRYFY_PYTHON='homebrew 3'
before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then git clone https://github.com/MacPython/terryfy; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then source terryfy/travis_tools.sh; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then get_python_environment $TERRYFY_PYTHON venv; fi
- if [[ "$TERRYFY_PYTHON" == "homebrew 3" ]]; then alias pip=`which pip3` ; fi
install: install:
- pip install -U setuptools - pip install -U setuptools
- python bootstrap.py - python bootstrap.py
- bin/buildout - bin/buildout
script: script:
- bin/test -vvv1 - bin/test -v1 -j99
notifications: notifications:
email: false email: false
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment