From f034d2e271403c7b3b8a1c2728b2320ed157a037 Mon Sep 17 00:00:00 2001
From: James Farrington <JamesTFarrington@gmail.com>
Date: Fri, 3 Jun 2016 09:29:12 -0700
Subject: [PATCH] Tests with and without simplejson for every existing testenv
 (#1869)

---
 .travis.yml | 9 +++++++++
 tox.ini     | 5 ++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8d2d3c60..0f99a7e8 100644
--- 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
index bd936a4b..91a80c19 100644
--- 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