Fix filer versions in tox

This commit is contained in:
Iacopo Spalletti 2016-06-22 08:10:38 +02:00
parent 63168b8f56
commit 0fc168e147
No known key found for this signature in database
GPG key ID: BDCBC2EB289F60C6
2 changed files with 10 additions and 12 deletions

View file

@ -30,7 +30,7 @@ setup(
'django-parler>=1.5', 'django-parler>=1.5',
'django-cms>3.0.11', 'django-cms>3.0.11',
'django-taggit>=0.12.2', 'django-taggit>=0.12.2',
'django-filer>=1.2', 'django-filer>=1.1',
'pytz', 'pytz',
'django-taggit-templatetags', 'django-taggit-templatetags',
'django-taggit-autosuggest', 'django-taggit-autosuggest',

20
tox.ini
View file

@ -4,15 +4,24 @@ envlist = pep8,isort,py{35,34,27}-django{19}-{cms33,cms32,knocker},py{35,34,33,2
[testenv] [testenv]
commands = {env:COMMAND:python} cms_helper.py test djangocms_blog commands = {env:COMMAND:python} cms_helper.py test djangocms_blog
deps = deps =
py26: unittest2
django16: Django>=1.6,<1.7 django16: Django>=1.6,<1.7
django16: django-taggit<0.18 django16: django-taggit<0.18
django16: django-mptt<0.8 django16: django-mptt<0.8
django16: django-filer<1.2
django16: cmsplugin-filer<1.1
django17: Django>=1.7,<1.8 django17: Django>=1.7,<1.8
django17: django-mptt<0.8 django17: django-mptt<0.8
django17: django-filer<1.3
django17: cmsplugin-filer<1.2
django18: Django>=1.8,<1.9 django18: Django>=1.8,<1.9
django18: django-mptt>=0.8 django18: django-mptt>=0.8
django18: django-filer<1.3
django18: cmsplugin-filer<1.2
django19: Django>=1.9,<1.10 django19: Django>=1.9,<1.10
django19: django-mptt>=0.8 django19: django-mptt>=0.8
django19: django-filer<1.3
django19: cmsplugin-filer<1.2
cms30: https://github.com/divio/django-cms/archive/release/3.0.x.zip cms30: https://github.com/divio/django-cms/archive/release/3.0.x.zip
cms30: djangocms-text-ckeditor<2.8 cms30: djangocms-text-ckeditor<2.8
cms31: https://github.com/divio/django-cms/archive/release/3.1.x.zip cms31: https://github.com/divio/django-cms/archive/release/3.1.x.zip
@ -26,17 +35,6 @@ deps =
knocker: djangocms-text-ckeditor<3.0 knocker: djangocms-text-ckeditor<3.0
django-meta>=1.2 django-meta>=1.2
https://github.com/nephila/djangocms-helper/archive/develop.zip https://github.com/nephila/djangocms-helper/archive/develop.zip
py26: unittest2
py26: django-filer<1.2
py26: cmsplugin-filer<1.1
py27: django-filer<1.3
py27: cmsplugin-filer<1.2
py33: django-filer<1.3
py33: cmsplugin-filer<1.2
py34: django-filer<1.3
py34: cmsplugin-filer<1.2
py35: django-filer<1.3
py35: cmsplugin-filer<1.2
https://github.com/aldryn/aldryn-apphooks-config/archive/master.zip https://github.com/aldryn/aldryn-apphooks-config/archive/master.zip
https://github.com/nephila/djangocms-apphook-setup/archive/master.zip https://github.com/nephila/djangocms-apphook-setup/archive/master.zip
-r{toxinidir}/requirements-test.txt -r{toxinidir}/requirements-test.txt