From c96b2848bced3044fd301bc0a132e897ab8631cf Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Wed, 13 Dec 2017 16:07:50 +0000 Subject: [PATCH] Use django-modelcluster 4.0 --- setup.py | 4 ++-- tox.ini | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 23ac88e34a..1f18b4c58d 100755 --- a/setup.py +++ b/setup.py @@ -22,9 +22,9 @@ except ImportError: install_requires = [ "Django>=1.11,<2.1", - "django-modelcluster>=3.1,<4.0", + "django-modelcluster>=4.0,<5.0", "django-taggit>=0.20,<1.0", - "django-treebeard>=3.0,<5.0", + "django-treebeard>=4.2.0,<5.0", "djangorestframework>=3.1.3,<4.0", "Pillow>=2.6.1,<5.0", "beautifulsoup4>=4.5.1,<5.0", diff --git a/tox.ini b/tox.ini index 40ddd58ebc..0d4adbf42b 100644 --- a/tox.ini +++ b/tox.ini @@ -43,7 +43,6 @@ deps = dj111-mssql: django-pyodbc-azure==1.11.0.0 dj20: Django>=2.0,<2.1 dj20: git+https://github.com/jdufresne/django-taggit.git@dj20 - dj20: git+https://github.com/wagtail/django-modelcluster.git postgres: psycopg2>=2.6 mysql: mysqlclient==1.3.6 elasticsearch2: elasticsearch>=2,<3