Merge pull request #182 from edx/iamsobanjaved/jsonfield-switch

feat: replace jsonfield2 with jsonfield

Author: iamsobanjaved

lti_consumer/migrations/0013_auto_20210712_1352.py

@@ -0,0 +1,24 @@
+# Generated by Django 2.2.20 on 2021-07-12 13:52
+
+from django.db import migrations
+import jsonfield.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lti_consumer', '0012_rename_courseeditltifieldsenabledflag_model'),
+    ]
+
+    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,5 +13,5 @@ pycryptodomex
 pyjwkest
 edx-opaque-keys[django]
 django-filter
-jsonfield2
+jsonfield
 django-config-models         # Configuration models for Django allowing config management with auditing

requirements/base.txt

@@ -21,7 +21,7 @@ django==2.2.24
     #   django-filter
     #   djangorestframework
     #   edx-django-utils
-    #   jsonfield2
+    #   jsonfield
 django-config-models==2.2.0
     # via
     #   -c requirements/constraints.txt
@@ -46,10 +46,8 @@ future==0.18.2
     # via pyjwkest
 idna==3.2
     # via requests
-jsonfield2==3.0.3
-    # via
-    #   -c requirements/constraints.txt
-    #   -r requirements/base.in
+jsonfield==3.1.0
+    # via -r requirements/base.in
 lazy==1.4
     # via -r requirements/base.in
 lxml==4.6.3

requirements/constraints.txt

@@ -16,8 +16,5 @@
 # Same as in edx-platform
 djangorestframework<4
 
-# jsonfield2 3.1.0 drops support for python 3.5
-jsonfield2<3.1.0
-
 # Same as in edx-platform
 django-config-models>=1.0.0

requirements/dev.txt

@@ -27,7 +27,7 @@ django==2.2.24
     #   djangorestframework
     #   edx-django-utils
     #   edx-i18n-tools
-    #   jsonfield2
+    #   jsonfield
 django-config-models==2.2.0
     # via -r requirements/base.txt
 django-crum==0.7.9
@@ -64,7 +64,7 @@ idna==3.2
     # via
     #   -r requirements/base.txt
     #   requests
-jsonfield2==3.0.3
+jsonfield==3.1.0
     # via -r requirements/base.txt
 lazy==1.4
     # via -r requirements/base.txt

requirements/test.txt

@@ -26,8 +26,6 @@ certifi==2021.5.30
     # via
     #   -r requirements/base.txt
     #   requests
-cffi==1.14.6
-    # via cryptography
 charset-normalizer==2.0.4
     # via
     #   -r requirements/base.txt
@@ -61,7 +59,7 @@ ddt==1.4.2
     #   djangorestframework
     #   edx-django-utils
     #   edx-lint
-    #   jsonfield2
+    #   jsonfield
     #   xblock-sdk
 django-config-models==2.2.0
     # via
@@ -119,20 +117,14 @@ importlib-metadata==4.7.1
     #   twine
 isort==5.9.3
     # via pylint
-jeepney==0.7.1
-    # via
-    #   keyring
-    #   secretstorage
 jinja2==3.0.1
     # via code-annotations
 jmespath==0.10.0
     # via
     #   boto3
     #   botocore
-jsonfield2==3.0.3
-    # via
-    #   -c requirements/constraints.txt
-    #   -r requirements/base.txt
+jsonfield==3.1.0
+    # via -r requirements/base.txt
 keyring==23.1.0
     # via twine
 lazy==1.4
@@ -181,8 +173,6 @@ psutil==5.8.0
     #   edx-django-utils
 pycodestyle==2.7.0
     # via -r requirements/test.in
-pycparser==2.20
-    # via cffi
 pycryptodomex==3.10.1
     # via
     #   -r requirements/base.txt

requirements/travis.txt

@@ -34,10 +34,6 @@ certifi==2021.5.30
     # via
     #   -r requirements/test.txt
     #   requests
-cffi==1.14.6
-    # via
-    #   -r requirements/test.txt
-    #   cryptography
 charset-normalizer==2.0.4
     # via
     #   -r requirements/test.txt
@@ -87,7 +83,7 @@ django==2.2.24
     #   djangorestframework
     #   edx-django-utils
     #   edx-lint
-    #   jsonfield2
+    #   jsonfield
     #   xblock-sdk
 django-config-models==2.2.0
     # via
@@ -149,7 +145,7 @@ idna==3.2
     # via
     #   -r requirements/test.txt
     #   requests
-importlib-metadata==4.7.1
+importlib-metadata==4.6.3
     # via
     #   -r requirements/test.txt
     #   keyring
@@ -158,11 +154,6 @@ isort==5.9.3
     # via
     #   -r requirements/test.txt
     #   pylint
-jeepney==0.7.1
-    # via
-    #   -r requirements/test.txt
-    #   keyring
-    #   secretstorage
 jinja2==3.0.1
     # via
     #   -r requirements/test.txt
@@ -172,10 +163,8 @@ jmespath==0.10.0
     #   -r requirements/test.txt
     #   boto3
     #   botocore
-jsonfield2==3.0.3
-    # via
-    #   -c requirements/constraints.txt
-    #   -r requirements/test.txt
+jsonfield==3.1.0
+    # via -r requirements/test.txt
 keyring==23.1.0
     # via
     #   -r requirements/test.txt
@@ -246,10 +235,6 @@ py==1.10.0
     #   tox
 pycodestyle==2.7.0
     # via -r requirements/test.txt
-pycparser==2.20
-    # via
-    #   -r requirements/test.txt
-    #   cffi
 pycryptodomex==3.10.1
     # via
     #   -r requirements/test.txt

setup.py

@@ -49,7 +49,7 @@ def is_requirement(line):
 
 setup(
     name='lti-consumer-xblock',
-    version='3.0.3',
+    version='3.0.4',
     author='Open edX project',
     author_email='oscm@edx.org',
     description='This XBlock implements the consumer side of the LTI specification.',