Merge pull request #196 from PetrDlouhy/no_jsonfield

Remove dependency on jsonfield, use Django builtin JSONField

Author: PetrDlouhy

README.rst

@@ -32,7 +32,6 @@ Dependencies
 ------------
 - `Django <https://github.com/django/django/>`_
 - `Redis <http://redis.io/>`_
-- `jsonfield <https://github.com/bradjasper/django-jsonfield/>`_
 - `django-modeldict <https://github.com/disqus/django-modeldict>`_
 
 (Detailed list in setup.py)
@@ -364,6 +363,7 @@ UNRELEASED
 - Add `setup.cfg` to support building of universal wheels (preparing for Python 3)
 - Tox runs `python setup.py test` (honouring both `install_requires` and `tests_require`)
 - Prepared `tox.ini` for Python 3 and Django 1.11 compatibility
+- Remove dependency on jsonfield, use Django builtin JSONField
 
 1.2.0
 ~~~~~

experiments/migrations/0001_initial.py

@@ -1,9 +1,13 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
+try:
+    from django.db.models import JSONField
+except ImportError:  # Django < 3.1
+    from jsonfield import JSONField
+
 from django.db import models, migrations
 import django.utils.timezone
-import jsonfield.fields
 from django.conf import settings
 
 
@@ -28,7 +32,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('name', models.CharField(max_length=128, serialize=False, primary_key=True)),
                 ('description', models.TextField(default=b'', null=True, blank=True)),
-                ('alternatives', jsonfield.fields.JSONField(default={}, blank=True)),
+                ('alternatives', JSONField(default={}, blank=True)),
                 ('relevant_chi2_goals', models.TextField(default=b'', null=True, blank=True)),
                 ('relevant_mwu_goals', models.TextField(default=b'', null=True, blank=True)),
                 ('state', models.IntegerField(default=0, choices=[(0, b'Default/Control'), (1, b'Enabled'), (3, b'Track')])),

experiments/models.py

@@ -3,10 +3,12 @@
 from django.core.serializers.json import DjangoJSONEncoder
 from django.conf import settings
 
-from jsonfield import JSONField
-
 import random
 import json
+try:
+    from django.db.models import JSONField
+except ImportError:  # Django < 3.1
+    from jsonfield import JSONField
 
 from experiments.counters import Counters
 from experiments.dateutils import now
@@ -27,7 +29,7 @@
 class Experiment(models.Model):
     name = models.CharField(primary_key=True, max_length=128)
     description = models.TextField(default="", blank=True, null=True)
-    alternatives = JSONField(default={}, blank=True)
+    alternatives = models.JSONField(default={}, blank=True)
     relevant_chi2_goals = models.TextField(default="", null=True, blank=True)
     relevant_mwu_goals = models.TextField(default="", null=True, blank=True)
 

setup.py

@@ -22,7 +22,6 @@
     install_requires=[
         'django>=1.11',
         'django-modeldict-yplan>=1.5.0,<2',
-        'jsonfield>=1.0.3,<3',
         'redis>=2.4.9',
     ],
     tests_require=[