Skip to content

Commit

Permalink
Updated Travis CI configuration to run multiple tox environments (for…
Browse files Browse the repository at this point in the history
… yajl2, and yajl2-cffi), instead of using individual matrix builds
  • Loading branch information
fuzeman committed Jun 30, 2017
1 parent e34d696 commit ac414c1
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
9 changes: 2 additions & 7 deletions .travis.yml
Expand Up @@ -13,20 +13,15 @@ python:
- 3.5
- nightly

env:
- BACKEND=python
- BACKEND=yajl2
- BACKEND=yajl2-cffi

before_install:
- sudo apt-get -qq update
- if [[ $BACKEND == yajl2* ]]; then sudo apt-get install -y libyajl2 libyajl-dev; fi
- if [[ $TRAVIS_PYTHON_VERSION == '2'* ]]; then sudo apt-get install -y libyajl2 libyajl-dev; fi
install:
- travis_retry pip install --upgrade coveralls setuptools tox-travis wheel
- if [[ $TRAVIS_PYTHON_VERSION != 'pypy'* ]]; then travis_retry pip install pyOpenSSL>=16.2.0; fi
script:
- export YAJL2_VERSION=">=2.0.0, <2.0.5"
- if [[ $TRAVIS_PYTHON_VERSION == '2'* ]] || [[ $BACKEND == 'python' ]]; then tox; fi
- tox
- if [[ $TRAVIS_PYTHON_VERSION != 'pypy3'* ]]; then
python setup.py bdist_wheel sdist;
else
Expand Down
19 changes: 12 additions & 7 deletions tox.ini
@@ -1,13 +1,18 @@
[tox]
envlist = clean,py{26,27,33,34,35,36,py}-ij{python,yajl,yajl2,yajl2cffi},stats,flake8
envlist = clean,py{26,27,33,34,35,36,37,py}-ij{python,yajl,yajl2,yajl2cffi},stats,flake8
skipsdist = True

[travis:env]
BACKEND =
python: ijpython
yajl: ijyajl
yajl2: ijyajl2
yajl2-cffi: ijyajl2cffi
[travis]
python =
2.6: py26
2.7: py27
3.3: py33-ijpython
3.4: py34-ijpython
3.5: py35-ijpython
3.6: py36-ijpython
3.7: py37-ijpython
pypy-5.4.1: pypy-ijpython
pypy3.3-5.2-alpha1: pypy3-ijpython

[testenv]
deps =
Expand Down

0 comments on commit ac414c1

Please sign in to comment.