Skip to content

Commit

Permalink
fix tox tests
Browse files Browse the repository at this point in the history
  • Loading branch information
mtford90 committed Apr 8, 2015
1 parent 82f7c46 commit 989dc26
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Django==1.6.8
Pygments==1.6
Pygments>=2.0,<2.1
six==1.6.0
simplejson==3.1.2
python-dateutil==2.2
python-dateutil>=2.4,<2.5
requests==2.2.1
sqlparse==0.1.11
Jinja2==2.7.2
Expand Down
5 changes: 3 additions & 2 deletions tests/test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
Pygments==1.6
Pygments>=2.0,<2.1
six==1.6.0
simplejson==3.1.2
python-dateutil==2.2
python-dateutil>=2.4,<2.5
requests==2.2.1
sqlparse==0.1.11
Jinja2==2.7.2
autopep8==1.0.2
pytz>2014.2
mock==1.0.1
Pillow==2.5.1
nose
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
envlist = py{27,34}-django{15,16,17}

[testenv]
commands = {toxinidir}/tests/manage.py test
commands = nosetests {toxinidir}/tests/tests
setenv =
DJANGO_SETTINGS_MODULE=settings
DJANGO_SETTINGS_MODULE=tests.settings
PYTHONPATH={toxinidir}/tests

deps =
Expand Down

0 comments on commit 989dc26

Please sign in to comment.