Turn testing Python 2.6 in Travis on

.travis.yml

@@ -4,11 +4,14 @@ python:
  - "2.7"
  - "3.3"
  - "3.4"
+ - "3.5"
 
+# Twisted dropped Python 2.6 support, so install a compatible version on 2.6
 install:
+ - pip install --upgrade pip setuptools
+ - pip install -r test-requirements.txt
  - pip install -e .[commands,consumers]
- - pip install nose mock sqlalchemy unittest2
-script: nosetests -v
+script: python setup.py nosetests
 notifications:
     email: false
     irc:
@@ -20,3 +23,4 @@ matrix:
   allow_failures:
     - python: "3.3"
     - python: "3.4"
+    - python: "3.5"

setup.cfg

@@ -1,3 +1,5 @@
 [nosetests]
 
 where=fedmsg/tests
+verbosity=2
+detailed-errors=1

setup.py

@@ -96,6 +96,9 @@
 ))
 tests_require = [
     'nose',
+    'moksha.hub',
+    'pygments',
+    'psutil',
     'sqlalchemy',  # For the persistent-store test(s).
 ]
 

test-requirements.txt

@@ -0,0 +1,11 @@
+nose
+moksha.hub
+pygments
+psutil
+sqlalchemy
+mock; python_version <= '2.7'
+argparse; python_version <= '2.6'
+ordereddict; python_version <= '2.6'
+logutils; python_version <= '2.6'
+unittest2; python_version <= '2.6'
+Twisted==12.2; python_version <= '2.6'

tox.ini

@@ -3,17 +3,17 @@ envlist = py{27}-six{13,17,19}
 downloadcache = {toxworkdir}/_download/
 
 [testenv]
+recreate = True
 basepython =
     py26: python2.6
     py27: python2.7
     py34: python3.4
+    py35: python3.5
 deps =
     six13: six==1.3.0
     six17: six==1.7.3
     six19: six>=1.9.0
     nose
-    mock
-    sqlalchemy
 sitepackages = False
 commands =
-    nosetests {posargs}
+    python setup.py nosetests