Skip to content

Commit

Permalink
Fix dependancies
Browse files Browse the repository at this point in the history
  • Loading branch information
tomchristie committed Dec 12, 2014
1 parent baaa356 commit 26131a7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
5 changes: 0 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,5 @@ flake8==2.2.2

# Optional packages
markdown>=2.1.0
PyYAML>=3.10
defusedxml>=0.3
django-guardian==1.2.4
django-filter>=0.5.4
django-oauth-plus>=2.2.1
oauth2>=1.5.211
django-oauth2-provider>=0.2.4
8 changes: 4 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ envlist =
py27-{flake8,docs},
{py26,py27}-django14,
{py26,py27,py32,py33,py34}-django{15,16},
{py27,py32,py33,py34}-django{17,master}
{py27,py32,py33,py34}-django17,
{py27,py32,py33,py34}-djangomaster

[testenv]
commands = ./runtests.py --fast
Expand All @@ -15,10 +16,9 @@ deps =
django16: Django==1.6.8
django17: Django==1.7.1
djangomaster: https://github.com/django/django/zipball/master
{py26,py27}-django{14,15,16,17}: django-guardian==1.2.3
django-guardian==1.2.4
pytest-django==2.6.1
django-filter==0.7
defusedxml==0.3
django-filter==0.9.1
markdown>=2.1.0

[testenv:py27-flake8]
Expand Down

0 comments on commit 26131a7

Please sign in to comment.