From d27c980ea3fae69d43dd119076db5ce12aad2b58 Mon Sep 17 00:00:00 2001
From: groovecoder <luke.crouch@gmail.com>
Date: Thu, 25 Feb 2016 21:24:31 -0600
Subject: [PATCH] fix #243: add TEST_RUNNER to tox.ini passenv

tidy up some travis and tox directives
---
 .gitignore            |  3 ++-
 .travis.yml           | 18 +++---------------
 requirements-test.txt |  2 ++
 tox.ini               |  7 ++-----
 4 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 79f3445a..e7203872 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,5 @@ MANIFEST
 stunnel.log
 stunnel/stunnel.pem
 docs/html
-.tox
\ No newline at end of file
+.tox
+htmlcov
diff --git a/.travis.yml b/.travis.yml
index c1451b5b..a97a70cd 100644
--- a/.travis.yml
+++ b/.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
diff --git a/requirements-test.txt b/requirements-test.txt
index dac31ad1..2a89e7ba 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1,3 +1,5 @@
+-r requirements.txt
+
 coverage==4.0.3
 django-nose==1.4.2
 flake8==2.5.0
diff --git a/tox.ini b/tox.ini
index 88384059..e8d9383e 100644
--- a/tox.ini
+++ b/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