Revert "chore: Replace jsonfield2 with jsonfield" (#155)

* Revert "chore: Replace jsonfield2 with jsonfield"

This reverts commit 2fd330f8.

* fix: only kept jsonfield related revert changes and rest are removed

lti_consumer/migrations/0011_update_jsonfield.py

-# Generated by Django 2.2.19 on 2021-03-01 14:52
-
-from django.db import migrations
-import jsonfield.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('lti_consumer', '0010_backfill-empty-string-lti-config'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='lticonfiguration',
-            name='lti_config',
-            field=jsonfield.fields.JSONField(blank=True, default=dict, help_text='LTI configuration data.'),
-        ),
-        migrations.AlterField(
-            model_name='ltidlcontentitem',
-            name='attributes',
-            field=jsonfield.fields.JSONField(),
-        ),
-    ]

requirements/base.in

@@ -13,4 +13,4 @@ pycryptodomex
 pyjwkest
 edx-opaque-keys[django]
 django-filter
-jsonfield
+jsonfield2

requirements/base.txt

@@ -20,7 +20,7 @@ django==2.2.19
     #   -r requirements/base.in
     #   django-filter
     #   edx-opaque-keys
-    #   jsonfield
+    #   jsonfield2
 edx-opaque-keys[django]==2.2.0
     # via -r requirements/base.in
 fs==2.4.12
@@ -29,8 +29,10 @@ future==0.18.2
     # via pyjwkest
 idna==2.10
     # via requests
-jsonfield==3.1.0
-    # via -r requirements/base.in
+jsonfield2==3.0.3
+    # via
+    #   -c requirements/constraints.txt
+    #   -r requirements/base.in
 lazy==1.4
     # via -r requirements/base.in
 lxml==4.6.2

requirements/constraints.txt

@@ -24,3 +24,6 @@ stevedore<=1.32.0
 
 # Same as in edx-platform
 djangorestframework==3.9.4
+
+# jsonfield2 3.1.0 drops support for python 3.5
+jsonfield2<3.1.0

requirements/dev.txt

@@ -26,7 +26,7 @@ django==2.2.19
     #   django-filter
     #   edx-i18n-tools
     #   edx-opaque-keys
-    #   jsonfield
+    #   jsonfield2
 edx-i18n-tools==0.5.0
     # via -r requirements/dev.in
 edx-opaque-keys[django]==2.2.0
@@ -43,7 +43,7 @@ idna==2.10
     # via
     #   -r requirements/base.txt
     #   requests
-jsonfield==3.1.0
+jsonfield2==3.0.3
     # via -r requirements/base.txt
 lazy==1.4
     # via -r requirements/base.txt

requirements/test.txt

@@ -55,7 +55,7 @@ django-pyfs==3.0
     #   django-pyfs
     #   edx-lint
     #   edx-opaque-keys
-    #   jsonfield
+    #   jsonfield2
     #   xblock-sdk
 djangorestframework==3.9.4
     # via
@@ -91,8 +91,10 @@ jmespath==0.10.0
     # via
     #   boto3
     #   botocore
-jsonfield==3.1.0
-    # via -r requirements/base.txt
+jsonfield2==3.0.3
+    # via
+    #   -c requirements/constraints.txt
+    #   -r requirements/base.txt
 lazy-object-proxy==1.5.2
     # via astroid
 lazy==1.4

requirements/travis.txt

@@ -73,7 +73,7 @@ django==2.2.19
     #   django-pyfs
     #   edx-lint
     #   edx-opaque-keys
-    #   jsonfield
+    #   jsonfield2
     #   xblock-sdk
 djangorestframework==3.9.4
     # via
@@ -123,8 +123,10 @@ jmespath==0.10.0
     #   -r requirements/test.txt
     #   boto3
     #   botocore
-jsonfield==3.1.0
-    # via -r requirements/test.txt
+jsonfield2==3.0.3
+    # via
+    #   -c requirements/constraints.txt
+    #   -r requirements/test.txt
 lazy-object-proxy==1.5.2
     # via
     #   -r requirements/test.txt

setup.py

@@ -49,7 +49,7 @@ with open('README.rst') as _f:
 
 setup(
     name='lti-consumer-xblock',
-    version='2.7.3',
+    version='2.7.4',
     description='This XBlock implements the consumer side of the LTI specification.',
     long_description=long_description,
     long_description_content_type='text/x-rst',