From e20f3e4c0e90c98114fff7d4e9a47631cbb330a2 Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Fri, 5 Dec 2014 20:29:48 -0500
Subject: [PATCH 1/2] Switch to using tox to run our tests and expect PyPy to
 pass

---
 .travis.yml | 36 +++++++++++++++++++++---------------
 tox.ini     | 10 ++++++++++
 2 files changed, 31 insertions(+), 15 deletions(-)
 create mode 100644 tox.ini

diff --git a/.travis.yml b/.travis.yml
index e2354e6..70ec890 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,25 @@
 language: python
-python:
-  - "2.6"
-  - "2.7"
-  - "3.2"
-  - "3.3"
-  - "PyPy"
-install:
-  - "pip install ."
-script:
-  - py.test
+
+env:
+  # We have to explicitly use the CC arguments here because Travis does not
+  # support the compiler directive with language: python.
+  - TOXENV=py26 CC=gcc
+  - TOXENV=py27 CC=gcc
+  - TOXENV=py32 CC=gcc
+  - TOXENV=py33 CC=gcc
+  - TOXENV=py34 CC=gcc
+  - TOXENV=pypy CC=gcc
+  - TOXENV=py26 CC=clang
+  - TOXENV=py27 CC=clang
+  - TOXENV=py32 CC=clang
+  - TOXENV=py33 CC=clang
+  - TOXENV=py34 CC=clang
+  - TOXENV=pypy CC=clang
+
+install: pip install tox
+
+script: tox
+
 branches:
   only:
     - master
-matrix:
-  allow_failures:
-    # Travis-CI currently has PyPy 1.9 which does not have the CFFI backend.
-    #   See: https://github.com/travis-ci/travis-ci/issues/1106
-    - python: "PyPy"
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..268ecb9
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,10 @@
+[tox]
+envlist = py26,py27,pypy,py32,py33,py34
+
+[testenv]
+# If you add a new dep here you probably need to add it in setup.py as well
+deps =
+    mock
+    pytest
+commands =
+    py.test --capture no --strict {posargs}

From de5cfbde88df261129e4b52524a603c1a3ba69dd Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Fri, 5 Dec 2014 20:35:18 -0500
Subject: [PATCH 2/2] We don't need this optimization in the bcrypt test suite

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 268ecb9..09b4bc8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,4 +7,4 @@ deps =
     mock
     pytest
 commands =
-    py.test --capture no --strict {posargs}
+    py.test --strict {posargs}