From 465574155a1ce930b66bdcc085625d83e4a74b15 Mon Sep 17 00:00:00 2001 From: igor Date: Wed, 9 Jan 2019 11:43:59 +0100 Subject: [PATCH 1/3] django 2.1 wants renderer --- jsonate/widgets.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jsonate/widgets.py b/jsonate/widgets.py index 7d05952..aa8d1e8 100644 --- a/jsonate/widgets.py +++ b/jsonate/widgets.py @@ -11,7 +11,7 @@ class JsonateWidget(forms.Textarea): - def render(self, name, value, attrs=None): + def render(self, name, value, attrs=None, renderer=None): if not isinstance(value, basestring): value = jsonate(value, indent=2) - return super(JsonateWidget, self).render(name, value, attrs) \ No newline at end of file + return super(JsonateWidget, self).render(name, value, attrs, renderer) \ No newline at end of file From 13ee6384ad78a9c7dc0f66bfabbd826a8a5554ef Mon Sep 17 00:00:00 2001 From: igor Date: Wed, 9 Jan 2019 12:27:58 +0100 Subject: [PATCH 2/3] test Django 2.0 & 2.1 --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 597fe8a..55ef4f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,8 @@ env: - DJANGO=1.9 - DJANGO=1.10 - DJANGO=1.11 + - DJANGO=2.0 + - DJANGO=2.1 install: - pip install django==${DJANGO} Pillow psycopg2 - pip install . From c8702120bd5386531239c17d6f53c61da47a75f9 Mon Sep 17 00:00:00 2001 From: igor Date: Wed, 9 Jan 2019 13:13:28 +0100 Subject: [PATCH 3/3] exclude 2.x Python with 2.x Django --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 55ef4f2..0ed3231 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,12 @@ env: - DJANGO=1.11 - DJANGO=2.0 - DJANGO=2.1 +matrix: + exclude: + - python: "2.7" + env: DJANGO=2.0 + - python: "2.7" + env: DJANGO=2.1 install: - pip install django==${DJANGO} Pillow psycopg2 - pip install .