From 715b240589c76ff03cdedc9e74899a95e92b1352 Mon Sep 17 00:00:00 2001
From: Dan Helfman <witten@torsion.org>
Date: Sun, 15 Mar 2015 10:14:30 -0700
Subject: [PATCH] Now using tox to run tests against multiple versions of
 Python in one go.

---
 .hgignore             | 1 +
 NEWS                  | 5 +++--
 README.md             | 8 ++++----
 test_requirements.txt | 2 ++
 tox.ini               | 8 ++++++++
 5 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 test_requirements.txt
 create mode 100644 tox.ini

diff --git a/.hgignore b/.hgignore
index abab0777..d7c266a5 100644
--- a/.hgignore
+++ b/.hgignore
@@ -2,3 +2,4 @@ syntax: glob
 *.egg-info
 *.pyc
 *.swp
+.tox
diff --git a/NEWS b/NEWS
index 1464d2bd..624ad275 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,9 @@
 0.0.4-dev
 
+ * Now using tox to run tests against multiple versions of Python in one go.
  * Helpful error message about how to create a repository if one is missing.
- * Added a troubleshooting section with steps to deal with broken pipes.
- * Added nosetests config file (setup.cfg) with defaults.
+ * Troubleshooting section with steps to deal with broken pipes.
+ * Nosetests config file (setup.cfg) with defaults.
 
 0.0.3
 
diff --git a/README.md b/README.md
index cd4298d5..c6082730 100644
--- a/README.md
+++ b/README.md
@@ -90,13 +90,13 @@ If you'd like to see the available command-line arguments, view the help:
 
 ## Running tests
 
-To install test-specific dependencies, first run:
+First install tox, which is used for setting up testing environments:
 
-    sudo python setup.py test
+    pip install tox
 
-To actually run tests, run:
+Then, to actually run tests, run:
 
-    nosetests
+    tox
 
 
 ## Troubleshooting
diff --git a/test_requirements.txt b/test_requirements.txt
new file mode 100644
index 00000000..5a34a857
--- /dev/null
+++ b/test_requirements.txt
@@ -0,0 +1,2 @@
+flexmock==0.9.7
+nose==1.3.4
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..daf5e8d0
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,8 @@
+[tox]
+envlist=py27,py34
+skipsdist=True
+
+[testenv]
+usedevelop=True
+deps=-rtest_requirements.txt
+commands = nosetests