Test on marshmallow 2 and 3

marshmallow-code · Sep 11, 2018 · 6fd478f · 6fd478f
1 parent 13d6389
commit 6fd478f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,11 +4,15 @@ python:
   - '3.5'
   - '3.6'
 
+env:
+  - MARSHMALLOW_VERSION=2
+  - MARSHMALLOW_VERSION=3
+
 install:
   - pip install tox
   - pip install coveralls
 
-script: tox -e $(echo py$TRAVIS_PYTHON_VERSION | tr -d .)
+script: tox -e $(echo py$TRAVIS_PYTHON_VERSION | tr -d .)-ma$MARSHMALLOW_VERSION
 
 after_success:
   - coveralls --verbose
diff --git a/tox.ini b/tox.ini
@@ -1,11 +1,13 @@
 [tox]
-envlist = py35, py36
+envlist = {py35,py36}-{ma2,ma3}
 
 [testenv]
 deps =
     flake8>=3.2.0
     pytest>=2.8
     pytest-cov>=2.4.0
+    ma2: marshmallow>=2.15.0,<3.0.0
+    ma3: marshmallow>=3.0.0b0
 commands =
     flake8 .
     py.test --cov=flask_rest_api tests