From e7ace5c1818d10ed9c7916113e08c2a291e4b82b Mon Sep 17 00:00:00 2001 From: Michael van Tellingen Date: Mon, 7 Mar 2016 10:22:28 +0100 Subject: [PATCH] Dependency update: Support django-treebeard 3.0 and 4.0 releases The admin extensions in django treebeard 3.0 are not compatible with Django 1.9. Although these are not used by Wagtail they are used in other projects (e.g. Oscar), so we should allow treebeard 4.0 which is compatible with Django 1.9. --- setup.py | 2 +- tox.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 992c8eedf..8292763ac 100755 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ install_requires = [ "Django>=1.8.1,<1.10", "django-modelcluster>=1.1,<1.2", "django-taggit>=0.17.5", - "django-treebeard==3.0", + "django-treebeard>=3.0,<5.0", "djangorestframework>=3.1.3", "Pillow>=2.6.1", "beautifulsoup4>=4.3.2", diff --git a/tox.ini b/tox.ini index cc0703e3a..fd63fba2b 100644 --- a/tox.ini +++ b/tox.ini @@ -21,7 +21,7 @@ basepython = deps = django-modelcluster>=1.1b1 django-taggit>=0.17.5 - django-treebeard==3.0 + django-treebeard>=3.0,<5.0 django-sendfile==0.3.6 djangorestframework==3.1.3 Pillow>=2.3.0