From 0c7ac855f86ca980d9c5aeba83203ca6fb0ad4c9 Mon Sep 17 00:00:00 2001
From: HawkOwl <hawkowl@atleastfornow.net>
Date: Mon, 7 Jul 2014 20:15:17 +0800
Subject: [PATCH 1/6] stealing the travis and tox from klein

---
 .travis.yml |  38 +++++++++++
 tox.ini     | 185 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 223 insertions(+)
 create mode 100644 .travis.yml
 create mode 100644 tox.ini

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..d31e5f83
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,38 @@
+language: python
+python: 2.7
+
+env:
+    - TOX_ENV=pyflakes
+    - TOX_ENV=docs
+    - TOX_ENV=py26
+    - TOX_ENV=py27
+    - TOX_ENV=pypy
+    - TOX_ENV=py26-twtrunk
+    - TOX_ENV=py27-twtrunk
+    - TOX_ENV=pypy-twtrunk
+    - TOX_ENV=py26-tw132
+    - TOX_ENV=py27-tw132
+    - TOX_ENV=pypy-tw132
+    - TOX_ENV=py26-tw131
+    - TOX_ENV=py27-tw131
+    - TOX_ENV=pypy-tw131
+    - TOX_ENV=py26-tw130
+    - TOX_ENV=py27-tw130
+    - TOX_ENV=pypy-tw130
+    - TOX_ENV=py26-tw123
+    - TOX_ENV=py27-tw123
+    - TOX_ENV=pypy-tw123
+    - TOX_ENV=py26-tw122
+    - TOX_ENV=py27-tw122
+    - TOX_ENV=pypy-tw122
+    - TOX_ENV=py26-tw121
+    - TOX_ENV=py27-tw121
+    - TOX_ENV=pypy-tw121
+
+install:
+    - ./.travis/install.sh
+
+script: tox -e $TOX_ENV
+
+notifications:
+    email: false
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..4c422d7d
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,185 @@
+[tox]
+envlist =
+    py26,py27,pypy,
+    py26-tw132,py27-tw132,pypy-tw132,
+    py26-tw131,py27-tw131,pypy-tw131,
+    py26-tw130,py27-tw130,pypy-tw130,
+    py26-tw123,py27-tw123,pypy-tw123,
+    py26-tw122,py27-tw122,pypy-tw122,
+    py26-tw121,py27-tw121,pypy-tw121,
+    pyflakes, docs, docs-linkcheck
+
+###########################
+# Uses current Twisted
+###########################
+
+[testenv:py26]
+deps =
+    {[testenv]deps}
+    Twisted
+
+[testenv:py27]
+deps = {[testenv:py26]deps}
+
+[testenv:pypy]
+deps = {[testenv:py26]deps}
+
+###########################
+# Uses trunk Twisted
+###########################
+
+[testenv:py26-twtrunk]
+basepython = python2.6
+deps =
+    {[testenv]deps}
+    git+git://github.com/twisted/twisted.git
+
+[testenv:py27-twtrunk]
+basepython = python2.7
+deps = {[testenv:py26-twtrunk]deps}
+
+[testenv:pypy-twtrunk]
+basepython = pypy
+deps = {[testenv:py26-twtrunk]deps}
+
+###########################
+# Uses Twisted 13.2
+###########################
+
+[testenv:py26-tw132]
+basepython = python2.6
+deps =
+    {[testenv]deps}
+    Twisted==13.2
+
+[testenv:py27-tw132]
+basepython = python2.7
+deps = {[testenv:py26-tw132]deps}
+
+[testenv:pypy-tw132]
+basepython = pypy
+deps = {[testenv:py26-tw132]deps}
+
+###########################
+# Uses Twisted 13.1
+###########################
+
+[testenv:py26-tw131]
+basepython = python2.6
+deps =
+    {[testenv]deps}
+    Twisted==13.1
+
+[testenv:py27-tw131]
+basepython = python2.7
+deps = {[testenv:py26-tw131]deps}
+
+[testenv:pypy-tw131]
+basepython = pypy
+deps = {[testenv:py26-tw131]deps}
+
+###########################
+# Uses Twisted 13.0
+###########################
+
+[testenv:py26-tw130]
+basepython = python2.6
+deps =
+    {[testenv]deps}
+    Twisted==13.0
+
+[testenv:py27-tw130]
+basepython = python2.7
+deps = {[testenv:py26-tw130]deps}
+
+[testenv:pypy-tw130]
+basepython = pypy
+deps = {[testenv:py26-tw130]deps}
+
+###########################
+# Uses Twisted 12.3
+###########################
+
+[testenv:py26-tw123]
+basepython = python2.6
+deps =
+    {[testenv]deps}
+    Twisted==12.3
+
+[testenv:py27-tw123]
+basepython = python2.7
+deps = {[testenv:py26-tw123]deps}
+
+[testenv:pypy-tw123]
+basepython = pypy
+deps = {[testenv:py26-tw123]deps}
+
+###########################
+# Uses Twisted 12.2
+###########################
+
+[testenv:py26-tw122]
+basepython = python2.6
+deps =
+    {[testenv]deps}
+    Twisted==12.2
+
+[testenv:py27-tw122]
+basepython = python2.7
+deps = {[testenv:py26-tw122]deps}
+
+[testenv:pypy-tw122]
+basepython = pypy
+deps = {[testenv:py26-tw122]deps}
+
+###########################
+# Uses Twisted 12.1
+###########################
+
+[testenv:py26-tw121]
+basepython = python2.6
+deps =
+    {[testenv]deps}
+    Twisted==12.1
+
+[testenv:py27-tw121]
+basepython = python2.7
+deps = {[testenv:py26-tw121]deps}
+
+[testenv:pypy-tw121]
+basepython = pypy
+deps = {[testenv:py26-tw121]deps}
+
+###########################
+# Run pyflakes
+###########################
+
+[testenv:pyflakes]
+deps = pyflakes
+commands = pyflakes klein
+
+###########################
+# Default testenv
+###########################
+
+[testenv]
+deps = mock
+commands =
+    {envpython} --version
+    trial --version
+    trial klein
+
+[testenv:docs]
+deps =
+    sphinx
+    sphinx_rtd_theme
+basepython = python2.7
+commands =
+    sphinx-build -b html -d {envtmpdir}/doctrees docs docs/_build/html
+
+[testenv:docs-linkcheck]
+deps = {[testenv:docs]deps}
+basepython = python2.7
+commands =
+    sphinx-build -b html -d {envtmpdir}/doctrees docs docs/_build/html
+    sphinx-build -b linkcheck docs docs/_build/html
\ No newline at end of file

From 788f007286321702c15c6705c44279c0163d2167 Mon Sep 17 00:00:00 2001
From: HawkOwl <hawkowl@atleastfornow.net>
Date: Mon, 7 Jul 2014 20:24:32 +0800
Subject: [PATCH 2/6] Edit tox config

---
 MANIFEST.in |  1 +
 tox.ini     | 45 ++++++++++++++++++++++++++-------------------
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 9e31b932..a8fe0ba8 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,3 @@
 include MANIFEST.in
 include TODO
+include README.md
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 4c422d7d..9c1ee4c0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,13 +1,14 @@
 [tox]
 envlist =
     py26,py27,pypy,
+    py26-tw140,py27-tw140,pypy-tw140,
     py26-tw132,py27-tw132,pypy-tw132,
     py26-tw131,py27-tw131,pypy-tw131,
     py26-tw130,py27-tw130,pypy-tw130,
     py26-tw123,py27-tw123,pypy-tw123,
     py26-tw122,py27-tw122,pypy-tw122,
     py26-tw121,py27-tw121,pypy-tw121,
-    pyflakes, docs, docs-linkcheck
+    pyflakes
 
 ###########################
 # Uses current Twisted
@@ -42,6 +43,24 @@ deps = {[testenv:py26-twtrunk]deps}
 basepython = pypy
 deps = {[testenv:py26-twtrunk]deps}
 
+###########################
+# Uses Twisted 14.0
+###########################
+
+[testenv:py26-tw140]
+basepython = python2.6
+deps =
+    {[testenv]deps}
+    Twisted==14.0
+
+[testenv:py27-tw140]
+basepython = python2.7
+deps = {[testenv:py26-tw140]deps}
+
+[testenv:pypy-tw140]
+basepython = pypy
+deps = {[testenv:py26-tw140]deps}
+
 ###########################
 # Uses Twisted 13.2
 ###########################
@@ -156,30 +175,18 @@ deps = {[testenv:py26-tw121]deps}
 
 [testenv:pyflakes]
 deps = pyflakes
-commands = pyflakes klein
+commands = pyflakes ldaptor
 
 ###########################
 # Default testenv
 ###########################
 
 [testenv]
-deps = mock
+deps = 
+     pyopenssl
+     pyparsing
+     pycrypto
 commands =
     {envpython} --version
     trial --version
-    trial klein
-
-[testenv:docs]
-deps =
-    sphinx
-    sphinx_rtd_theme
-basepython = python2.7
-commands =
-    sphinx-build -b html -d {envtmpdir}/doctrees docs docs/_build/html
-
-[testenv:docs-linkcheck]
-deps = {[testenv:docs]deps}
-basepython = python2.7
-commands =
-    sphinx-build -b html -d {envtmpdir}/doctrees docs docs/_build/html
-    sphinx-build -b linkcheck docs docs/_build/html
\ No newline at end of file
+    trial ldaptor
\ No newline at end of file

From ca6c26a41c0246f7c471a1c5867ac8e1910ed3cf Mon Sep 17 00:00:00 2001
From: HawkOwl <hawkowl@atleastfornow.net>
Date: Mon, 7 Jul 2014 20:25:23 +0800
Subject: [PATCH 3/6] gitignore fix

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 2687fbe6..9072468a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 *.pyo
 /_trial_temp
 /build
+/.tox
 /doc/addressbook-session
 /doc/addressbook-slides
 /doc/api

From 362ae18df3ad27c54cb68cfb2d90e18b71447d94 Mon Sep 17 00:00:00 2001
From: HawkOwl <hawkowl@atleastfornow.net>
Date: Mon, 7 Jul 2014 20:26:08 +0800
Subject: [PATCH 4/6] Fix up travis to point to the correct targets

---
 .travis.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d31e5f83..c020de9b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,13 +3,15 @@ python: 2.7
 
 env:
     - TOX_ENV=pyflakes
-    - TOX_ENV=docs
     - TOX_ENV=py26
     - TOX_ENV=py27
     - TOX_ENV=pypy
     - TOX_ENV=py26-twtrunk
     - TOX_ENV=py27-twtrunk
     - TOX_ENV=pypy-twtrunk
+    - TOX_ENV=py26-tw140
+    - TOX_ENV=py27-tw140
+    - TOX_ENV=pypy-tw140
     - TOX_ENV=py26-tw132
     - TOX_ENV=py27-tw132
     - TOX_ENV=pypy-tw132
@@ -29,9 +31,6 @@ env:
     - TOX_ENV=py27-tw121
     - TOX_ENV=pypy-tw121
 
-install:
-    - ./.travis/install.sh
-
 script: tox -e $TOX_ENV
 
 notifications:

From 86c6991cfa2220547fbe0d7a88e6ce4653a69d83 Mon Sep 17 00:00:00 2001
From: HawkOwl <hawkowl@atleastfornow.net>
Date: Mon, 7 Jul 2014 20:29:31 +0800
Subject: [PATCH 5/6] dfgdbf stupid travis not having tox

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c020de9b..c80023a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,9 @@ env:
     - TOX_ENV=py27-tw121
     - TOX_ENV=pypy-tw121
 
-script: tox -e $TOX_ENV
+script: 
+	pip install tox
+	tox -e $TOX_ENV
 
 notifications:
     email: false

From ea4f2c42679c163fe628a07394ecb66a175d22ba Mon Sep 17 00:00:00 2001
From: HawkOwl <hawkowl@atleastfornow.net>
Date: Mon, 7 Jul 2014 20:31:02 +0800
Subject: [PATCH 6/6] okay maybe this will work

---
 .travis.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c80023a5..88018b52 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,9 +31,7 @@ env:
     - TOX_ENV=py27-tw121
     - TOX_ENV=pypy-tw121
 
-script: 
-	pip install tox
-	tox -e $TOX_ENV
+script: pip install tox && tox -e $TOX_ENV
 
 notifications:
     email: false