Tox and Travis configuration

peopledoc · Oct 14, 2013 · e5811fc · e5811fc
1 parent 3da237c
commit e5811fc
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ python:
  - "2.7"
  - "3.3"
 install:
+ - pip install -r test-requirements.pip
  - python setup.py develop
  - (cd demo; python setup.py develop)
 script: flake8 chartjs && demo test demoproject

diff --git a/demo/demoproject/settings.py b/demo/demoproject/settings.py
@@ -85,8 +85,6 @@
 NOSE_ARGS = ['--verbose',
  '--nocapture',
  '--rednose',
- '--with-id', # allows --failed which only reruns failed tests
- '--id-file=%s' % join(data_dir, 'noseids'),
  '--with-doctest',
  '--with-xunit',
  '--xunit-file=%s' % join(data_dir, 'nosetests.xml'),

diff --git a/test-requirements.pip b/test-requirements.pip
@@ -0,0 +1,6 @@
+ Django
+ flake8
+ django-nose
+ coverage
+ nose
+ rednose
diff --git a/test.sh b/test.sh
diff --git a/tox.ini b/tox.ini
@@ -3,15 +3,8 @@ envlist = py27,py33
 
 [testenv]
 commands =
+ pip install -r test-requirements.pip
  pip install -e ./
  pip install -e demo/
  flake8 chartjs
- rm -f var/noseids
  coverage run --branch --source=chartjs {envbindir}/demo test demoproject
-deps =
- Django
- flake8
- django-nose
- coverage
- nose
- rednose