From fe34a6ae0172af70287fa3bfbdbad798ca5a0494 Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Sun, 7 Feb 2016 13:02:32 +0100 Subject: [PATCH] Use modern parler in tests --- requirements-test.txt | 1 + tox.ini | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/requirements-test.txt b/requirements-test.txt index 94e66fe..a9c6ae7 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -9,3 +9,4 @@ 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 0ed8921..b4322e2 100644 --- a/tox.ini +++ b/tox.ini @@ -7,19 +7,19 @@ deps = -r{toxinidir}/requirements-test.txt django16: Django>=1.6,<1.7 django16: django-taggit<0.18 + django16: django-mptt<0.8 django17: Django>=1.7,<1.8 django18: Django>=1.8,<1.9 django19: Django>=1.9,<1.10 django19: https://github.com/divio/django-filer/archive/develop.zip django19: https://github.com/divio/cmsplugin-filer/archive/develop.zip cms30: https://github.com/divio/django-cms/archive/support/3.0.x.zip + cms30: django-mptt<0.8 cms31: https://github.com/divio/django-cms/archive/support/3.1.x.zip cms32: https://github.com/divio/django-cms/archive/release/3.2.x.zip https://github.com/nephila/django-meta-mixin/archive/master.zip https://github.com/nephila/djangocms-helper/archive/develop.zip py26: unittest2 - django-parler<1.5 - django-mptt<0.8 https://github.com/aldryn/aldryn-apphooks-config/archive/master.zip https://github.com/nephila/djangocms-apphook-setup/archive/master.zip