fix #243: add TEST_RUNNER to tox.ini passenv

tidy up some travis and tox directives

.gitignore

@@ -12,4 +12,5 @@ MANIFEST
 stunnel.log
 stunnel/stunnel.pem
 docs/html
-.tox
+.tox
+htmlcov

.travis.yml

@@ -1,24 +1,12 @@
-sudo: false
-
-branches:
-    only:
-        master
-
 language: python
 
 addons:
     postgresql: '9.3'
 
 env:
-    global:
-        - DATABASE_URL="postgres://postgres@localhost:5432/codesy"
-        - SECRET_KEY="terrible-awful-secret-only-for-travis"
-        - DJANGO_DEBUG="True"
-        - TEST_RUNNER="django_nose.NoseTestSuiteRunner"
-    matrix:
-        - TOXENV=py27
-        - TOXENV=style
-        - TOXENV=docs
+    - TOXENV=py27 DATABASE_URL="postgres://postgres@localhost:5432/codesy" TEST_RUNNER="django_nose.NoseTestSuiteRunner"
+    - TOXENV=style
+    - TOXENV=docs
 
 install:
     - pip install tox

requirements-test.txt

@@ -1,3 +1,5 @@
+-r requirements.txt
+
 coverage==4.0.3
 django-nose==1.4.2
 flake8==2.5.0

tox.ini

@@ -3,13 +3,12 @@ envlist = py27, style, docs
 
 
 [testenv]
-passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
+passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH TEST_RUNNER
 deps =
-    -r{toxinidir}/requirements.txt
     -r{toxinidir}/requirements-test.txt
     coveralls
 commands =
-    coverage run manage.py test
+    coverage run ./manage.py test
     coveralls
 
 
@@ -19,14 +18,12 @@ ignore=W503
 
 [testenv:style]
 deps =
-    -r{toxinidir}/requirements.txt
     flake8
 commands = flake8 .
 
 
 [testenv:docs]
 deps =
-    -r{toxinidir}/requirements.txt
     sphinx
     sphinx_rtd_theme
 changedir = docs