Merge pull request #119 from ambitioninc/develop

3.1.0

.travis.yml

@@ -10,7 +10,6 @@ python:
 
 env:
   matrix:
-    - DJANGO=1.10
     - DJANGO=1.11
     - DJANGO=2.0
     - DJANGO=master
@@ -26,7 +25,6 @@ matrix:
     - { python: "2.7", env: DJANGO=master }
     - { python: "2.7", env: DJANGO=2.0 }
     - { python: "3.4", env: DJANGO=master }
-    - { python: "3.6", env: DJANGO=1.10 }
 
   allow_failures:
     - env: DJANGO=master

entity/migrations/0009_auto_20180402_2145.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.11 on 2018-04-02 21:45
+from __future__ import unicode_literals
+
+import django.contrib.postgres.fields.jsonb
+import django.core.serializers.json
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entity', '0008_auto_20180329_1934'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='entity',
+            name='entity_meta',
+            field=django.contrib.postgres.fields.jsonb.JSONField(encoder=django.core.serializers.json.DjangoJSONEncoder, null=True),
+        ),
+    ]

entity/models.py

@@ -4,6 +4,7 @@
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.postgres.fields import JSONField
+from django.core.serializers.json import DjangoJSONEncoder
 from django.db import models
 from django.db.models import Count, Q
 from django.utils.encoding import python_2_unicode_compatible
@@ -259,7 +260,7 @@ class Entity(BaseActivatableModel):
     entity_kind = models.ForeignKey(EntityKind, on_delete=models.PROTECT)
 
     # Metadata about the entity, stored as JSON
-    entity_meta = JSONField(null=True)
+    entity_meta = JSONField(null=True, encoder=DjangoJSONEncoder)
 
     # True if this entity is active
     is_active = models.BooleanField(default=True, db_index=True)

entity/version.py

@@ -1 +1 @@
-__version__ = '3.0.0'
+__version__ = '3.1.0'

release_notes.md

@@ -1,5 +1,7 @@
 ## Release Notes
 
+- 3.1.0:
+    - Add jsonfield encoder (drop support for 1.10)
 - 3.0.0:
     - Add tox to support more versions
     - Switch to django's JSONField

tox.ini

@@ -1,7 +1,6 @@
 [tox]
 envlist =
     flake8
-    py{27,34,35}-django110
     py{27,34,35,36}-django111
     py{34,35,36}-django20
     py{35,36}-djangomaster
@@ -10,7 +9,6 @@ envlist =
 setenv =
     DB = postgres
 deps =
-    django110: Django>=1.10,<1.11
     django111: Django>=1.11,<2.0
     django20: Django>=2.0,<2.1
     djangomaster: https://github.com/django/django/archive/master.tar.gz
@@ -25,7 +23,6 @@ commands = flake8 entity
 
 [travis:env]
 DJANGO =
-    1.10: django110
     1.11: django111
     2.0: django20
     master: djangomaster