From 861fd5bec70b84badeb3c13cb4ab596f282d52ce Mon Sep 17 00:00:00 2001
From: Alex Willmer <alex@moreati.org.uk>
Date: Thu, 22 Oct 2015 20:16:13 +0100
Subject: [PATCH 1/4] Allow test suite to run locally under Tox

Tests are run under CPython 2.6-2.7, 3.2-3.5
---
 .gitignore       |  1 +
 requirements.txt |  5 +++++
 tox.ini          | 14 ++++++++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 requirements.txt
 create mode 100644 tox.ini

diff --git a/.gitignore b/.gitignore
index a50e943..3f16be2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *.pyc
 /_trial_temp
 /.coverage
+/.tox
 /htmlcov
 /build
 /dist
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..adb487c
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,5 @@
+.
+coveralls
+pytest
+pytz
+twisted ; python_version <= '3.0'
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..4809765
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,14 @@
+[tox]
+envlist =
+    py26
+    py27
+    py32
+    py33
+    py34
+    py35
+
+[testenv]
+deps =
+    -rrequirements.txt
+commands =
+    py.test .

From 5a3c1ca768a7a4fd16a721af4e62e84e53b1f498 Mon Sep 17 00:00:00 2001
From: Alex Willmer <alex@moreati.org.uk>
Date: Thu, 22 Oct 2015 20:18:35 +0100
Subject: [PATCH 2/4] Use requirements.txt on Travis, to match Tox

---
 .travis.install | 9 ---------
 .travis.yml     | 3 +--
 2 files changed, 1 insertion(+), 11 deletions(-)
 delete mode 100644 .travis.install

diff --git a/.travis.install b/.travis.install
deleted file mode 100644
index 7823e08..0000000
--- a/.travis.install
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-PYTHON_VERSION=$(python --version 2>&1)
-
-if [[ "$PYTHON_VERSION" > "Python 3" ]]; then
-    true
-else
-    pip install twisted
-fi
diff --git a/.travis.yml b/.travis.yml
index ab462ab..0997925 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,7 @@ python:
   - "3.3"
 
 install:
-  - "bash .travis.install"
-  - "pip install pytest coveralls pytz ."
+  - "pip install -rrequirements.txt"
 script:
   - "coverage run $(which py.test) ."
 after_success:

From 51ff2bd6605a445a095530cbee83d9258d46fb02 Mon Sep 17 00:00:00 2001
From: Alex Willmer <alex@moreati.org.uk>
Date: Thu, 22 Oct 2015 20:19:01 +0100
Subject: [PATCH 3/4] Test CPython 3.4 and 3.5 on Travis, to match Tox

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 0997925..803b937 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,8 @@ python:
   - "2.7"
   - "3.2"
   - "3.3"
+  - "3.4"
+  - "3.5"
 
 install:
   - "pip install -rrequirements.txt"

From ca23393024da325f1fdbb0878d311d684781c9e4 Mon Sep 17 00:00:00 2001
From: Alex Willmer <alex@moreati.org.uk>
Date: Thu, 22 Oct 2015 20:29:13 +0100
Subject: [PATCH 4/4] Ensure installed coverage has Python 3.2 support

Coverage dropped CPython 3.2 support in 4.0a2
---
 requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements.txt b/requirements.txt
index adb487c..e85310e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,5 @@
 .
+coverage < 4.0
 coveralls
 pytest
 pytz