diff --git a/requirements-test.txt b/requirements-test.txt index a9c6ae76..94e66fe3 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -9,4 +9,3 @@ https://github.com/nephila/djangocms-helper/archive/develop.zip tox>=2.0 wheel pysolr -django-parler>=1.6 diff --git a/tox.ini b/tox.ini index b0e827e3..8a2bdf9a 100644 --- a/tox.ini +++ b/tox.ini @@ -8,6 +8,7 @@ deps = django16: django-taggit<0.18 django16: django-mptt<0.8 django16: django-filer<1.2 + django16: django-parler>=1.6,<1.7 django16: cmsplugin-filer<1.1 django16: django-haystack<2.5 django16: djangocms-admin-style<1.2 @@ -16,6 +17,7 @@ deps = django17: django-filer<1.3 django17: cmsplugin-filer<1.2 django17: django-haystack + django17: django-parler>=1.6,<1.7 django17: djangocms-admin-style<1.2 django17: django-taggit<0.18 django18: Django>=1.8,<1.9 @@ -24,12 +26,14 @@ deps = django18: cmsplugin-filer<1.2 django18: django-haystack django18: djangocms-admin-style>1.2,<1.3 + django18: django-parler>=1.6 django19: Django>=1.9,<1.10 django19: django-mptt>=0.8 django19: django-filer<1.3 django19: cmsplugin-filer<1.2 django19: django-haystack django19: djangocms-admin-style>1.2,<1.3 + django19: django-parler>=1.6 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 @@ -38,9 +42,9 @@ deps = cms32: djangocms-text-ckeditor<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 + cms34: https://github.com/divio/django-cms/archive/release/3.4.x.zip cms34: djangocms-text-ckeditor>=3.0 - knocker: https://github.com/divio/django-cms/archive/release/3.3.x.zip + knocker: https://github.com/divio/django-cms/archive/release/3.4.x.zip knocker: https://github.com/nephila/django-knocker/archive/master.zip?0.1.1 knocker: djangocms-text-ckeditor<3.0 django-meta>=1.2