From ae1b60da2833a89fc5b25f1b3c89136280a2e8e6 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Sat, 9 Jun 2012 03:22:14 -0700
Subject: [PATCH 1/2] Add support for tox (http://tox.testrun.org/)

---
 .gitignore |  4 +++-
 tox.ini    | 13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 tox.ini

diff --git a/.gitignore b/.gitignore
index 43c7c5ef6bda..a9c493de9cb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-# Editor temporary/working/backup files #
 #########################################
+# Editor temporary/working/backup files #
 .#*
 [#]*#
 *~
@@ -27,6 +27,8 @@ doc/_build
 dist
 # Egg metadata
 *.egg-info
+# tox testing tool
+.tox
 
 # OS generated files #
 ######################
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 000000000000..66fbb591f0b7
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,13 @@
+# Tox (http://tox.testrun.org/) is a tool for running tests
+# in multiple virtualenvs. This configuration file will run the
+# test suite on all supported python versions. To use it, "pip install tox"
+# and then run "tox" from this directory.
+
+[tox]
+envlist = py26, py27
+
+[testenv]
+commands = {envpython} tests.py
+deps =
+    nose
+    numpy

From 667600f83933b13e0dfbb9d3b45cfc2ce1b2744e Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Sat, 9 Jun 2012 03:25:40 -0700
Subject: [PATCH 2/2] Add .travis.yml for Travis CI (http://travis-ci.org/)

---
 .travis.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000000..aeaccf467010
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,11 @@
+language: python
+
+python:
+  - 2.6
+  - 2.7
+
+install:
+  - pip install --use-mirrors nose numpy PIL
+  - pip install .
+
+script: python tests.py