Tests with and without simplejson for every existing testenv (#1869)

pallets · Jun 3, 2016 · f034d2e · f034d2e
1 parent ae97ca8
commit f034d2e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -11,18 +11,27 @@ python:
 
 env:
   - REQUIREMENTS=lowest
+  - REQUIREMENTS=lowest-simplejson
   - REQUIREMENTS=release
+  - REQUIREMENTS=release-simplejson
   - REQUIREMENTS=devel
+  - REQUIREMENTS=devel-simplejson
 
 matrix:
   exclude:
     # Python 3 support currently does not work with lowest requirements
     - python: "3.3"
       env: REQUIREMENTS=lowest
+    - python: "3.3"
+      env: REQUIREMENTS=lowest-simplejson
     - python: "3.4"
       env: REQUIREMENTS=lowest
+    - python: "3.4"
+      env: REQUIREMENTS=lowest-simplejson
     - python: "3.5"
       env: REQUIREMENTS=lowest
+    - python: "3.5"
+      env: REQUIREMENTS=lowest-simplejson
 
 
 install:

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,7 @@
 [tox]
-envlist = {py26,py27,pypy}-{lowest,release,devel}, {py33,py34,py35}-{release,devel}
+envlist = {py26,py27,pypy}-{lowest,release,devel}{,-simplejson}, {py33,py34,py35}-{release,devel}{,-simplejson}
+
+
 
 [testenv]
 commands =
@@ -19,6 +21,7 @@ deps=
     devel: git+https://github.com/pallets/jinja.git
     devel: git+https://github.com/pallets/itsdangerous.git
     devel: git+https://github.com/jek/blinker.git
+    simplejson: simplejson
 
 [testenv:docs]
 deps = sphinx