Skip to content

Commit

Permalink
Fix dependencies in tox
Browse files Browse the repository at this point in the history
  • Loading branch information
yakky committed Jul 25, 2017
1 parent 51301df commit d96d016
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Expand Up @@ -9,7 +9,6 @@ python:
- 3.4
- 3.3
- 2.7
- 2.6

env:
matrix:
Expand Down
12 changes: 6 additions & 6 deletions tox.ini
Expand Up @@ -8,18 +8,23 @@ deps=
django16: django<1.7
django16: django-mptt<0.8
django16: django-nose<1.4
django16: django-filer<1.2
django17: django<1.8
django17: django-mptt<0.8
django17: django-nose<1.5
django17: django-filer<1.2
django18: django<1.9
django18: django-mptt>0.8
django18: django-nose<1.5
django18: https://github.com/divio/django-filer/archive/develop.zip
django19: django<1.10
django19: django-mptt>0.8
django19: django-nose<1.5
django19: https://github.com/divio/django-filer/archive/develop.zip
django110: django<1.10
django110: django-mptt>0.8
django110: django-nose<1.5
django110: https://github.com/divio/django-filer/archive/develop.zip
cms30: https://github.com/divio/django-cms/archive/release/3.0.x.zip
cms30: djangocms-text-ckeditor<2.8
cms31: https://github.com/divio/django-cms/archive/release/3.1.x.zip
Expand All @@ -28,13 +33,8 @@ deps=
cms32: djangocms-text-ckeditor>=2.8,<3.0
cms33: https://github.com/divio/django-cms/archive/release/3.3.x.zip
cms33: djangocms-text-ckeditor>=3.0
cms34: https://github.com/divio/django-cms/archive/develop.zip
cms33: https://github.com/divio/django-cms/archive/release/3.4.x.zip
cms34: https://github.com/divio/djangocms-text-ckeditor/archive/master.zip
py26: django-filer<1.2
py27: https://github.com/divio/django-filer/archive/develop.zip
py33: django-filer<1.2
py34: https://github.com/divio/django-filer/archive/develop.zip
py35: https://github.com/divio/django-filer/archive/develop.zip
py26: unittest2
coverage
html5lib<=0.9999999
Expand Down

0 comments on commit d96d016

Please sign in to comment.