diff --git a/.travis.yml b/.travis.yml index 0d81ac27..6b60506f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,14 +5,17 @@ python: - '3.6' env: - - MARSHMALLOW_VERSION=2 - - MARSHMALLOW_VERSION=3 + matrix: + - MARSHMALLOW_VERSION=2 APISPEC_VERSION=0 + - MARSHMALLOW_VERSION=2 APISPEC_VERSION=1 + - MARSHMALLOW_VERSION=3 APISPEC_VERSION=0 + - MARSHMALLOW_VERSION=3 APISPEC_VERSION=1 install: - pip install tox - pip install coveralls -script: tox -e $(echo py$TRAVIS_PYTHON_VERSION | tr -d .)-ma$MARSHMALLOW_VERSION +script: tox -e $(echo py$TRAVIS_PYTHON_VERSION | tr -d .)-ma$MARSHMALLOW_VERSION-apispec$APISPEC_VERSION after_success: - coveralls --verbose diff --git a/tox.ini b/tox.ini index 3cf050ed..6ef5f8d5 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = {py35,py36}-{ma2,ma3} +envlist = {py35,py36}-{ma2,ma3}-{apispec0,apispec1} [testenv] deps = @@ -8,6 +8,8 @@ deps = pytest-cov>=2.4.0 ma2: marshmallow>=2.15.0,<3.0.0 ma3: marshmallow>=3.0.0b13 + apispec0: apispec>=0.39.0,<1.0.0 + apispec1: apispec>=1.0.0b2 commands = flake8 . py.test --cov=flask_rest_api tests