Merge 886cb11 into 231918c

.gitignore

@@ -0,0 +1,8 @@
+*.pyc
+*.cache
+_trial_temp/
+apidocs/
+.tox/
+*~
+*.egg-info/
+.coverage

.travis.yml

@@ -7,20 +7,28 @@ branches:
   only:
     - master
 python:
-  - 2.6
   - 2.7
-  - pypy
-matrix:
-  allow_failures:
-    - python: "pypy"
+
+env:
+  - TOX_ENV=py26-twlatest
+  - TOX_ENV=py27-twlatest
+  - TOX_ENV=pypy-twlatest
+  - TOX_ENV=py26-tw150
+  - TOX_ENV=py27-tw150
+  - TOX_ENV=pypy-tw150
+  - TOX_ENV=py26-twtrunk
+  - TOX_ENV=py27-twtrunk
+  - TOX_ENV=pypy-twtrunk
+
 install:
-  - pip install -e .
-  - pip install coverage coveralls
+  - pip install tox coveralls
+
 script:
-  - coverage run --branch --source=axiom $(which trial) axiom
-  - coverage report -m
+  - tox -e $TOX_ENV
+
 after_success:
   - coveralls
+
 notifications:
   email: false
   irc:

tox.ini

@@ -1,28 +1,17 @@
 [tox]
-envlist = py26,py27,pypy,py26-trunkdeps,py27-trunkdeps,pypy-trunkdeps
+envlist = py26-{twlatest,tw150},{py26,py27,pypy}-{twtrunk,twlatest,tw150}
 
 [testenv]
 deps =
-    Twisted
-changedir = {toxworkdir}
+    twlatest: Twisted
+    twtrunk: https://github.com/twisted/twisted/archive/trunk.zip
+    tw150: Twisted==15.0
+    coverage
+# Travis doesn't have a new enough PyPy for this to work yet
+    pypy: cryptography < 1.0
 commands =
     pip install -r {toxinidir}/requirements-testing.txt
     coverage run {envdir}/bin/trial \
         --temp-directory={envdir}/_trial {posargs:axiom}
     coverage report --rcfile={toxinidir}/.coveragerc
     coverage html --rcfile={toxinidir}/.coveragerc --directory {envdir}/_coverage
-
-[testenv:py26-trunkdeps]
-basepython = python2.6
-deps =
-     --editable=svn+svn://svn.twistedmatrix.com/svn/Twisted/trunk
-
-[testenv:py27-trunkdeps]
-basepython = python2.7
-deps =
-     --editable=svn+svn://svn.twistedmatrix.com/svn/Twisted/trunk
-
-[testenv:pypy-trunkdeps]
-basepython = pypy
-deps =
-     --editable=svn+svn://svn.twistedmatrix.com/svn/Twisted/trunk