From b46c3c16fb1153e863536c4c04134a08b09c5fea Mon Sep 17 00:00:00 2001
From: Muhammad Soban Javed <58461728+iamsobanjaved@users.noreply.github.com>
Date: Tue, 13 Apr 2021 19:25:35 +0500
Subject: [PATCH] Revert "chore: Replace jsonfield2 with jsonfield" (#155)
* Revert "chore: Replace jsonfield2 with jsonfield"
This reverts commit 2fd330f8a62bc2fcc4951d546db5ca4920a5c1ec.
* fix: only kept jsonfield related revert changes and rest are removed
---
.../migrations/0011_update_jsonfield.py | 24 -------------------
requirements/base.in | 2 +-
requirements/base.txt | 8 ++++---
requirements/constraints.txt | 3 +++
requirements/dev.txt | 4 ++--
requirements/test.txt | 8 ++++---
requirements/travis.txt | 8 ++++---
setup.py | 2 +-
8 files changed, 22 insertions(+), 37 deletions(-)
delete mode 100644 lti_consumer/migrations/0011_update_jsonfield.py
diff --git a/lti_consumer/migrations/0011_update_jsonfield.py b/lti_consumer/migrations/0011_update_jsonfield.py
deleted file mode 100644
index 345a957..0000000
--- a/lti_consumer/migrations/0011_update_jsonfield.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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(),
- ),
- ]
diff --git a/requirements/base.in b/requirements/base.in
index c5d31b8..bd89e7b 100644
--- a/requirements/base.in
+++ b/requirements/base.in
@@ -13,4 +13,4 @@ pycryptodomex
pyjwkest
edx-opaque-keys[django]
django-filter
-jsonfield
+jsonfield2
diff --git a/requirements/base.txt b/requirements/base.txt
index 4bcfcf5..bb21382 100644
--- a/requirements/base.txt
+++ b/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
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index faf74b8..769dc5b 100644
--- a/requirements/constraints.txt
+++ b/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
diff --git a/requirements/dev.txt b/requirements/dev.txt
index e182def..e136e8b 100644
--- a/requirements/dev.txt
+++ b/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
diff --git a/requirements/test.txt b/requirements/test.txt
index 70209f1..b9ad8ca 100644
--- a/requirements/test.txt
+++ b/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
diff --git a/requirements/travis.txt b/requirements/travis.txt
index 62a635a..bb2949b 100644
--- a/requirements/travis.txt
+++ b/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
diff --git a/setup.py b/setup.py
index 22058ce..c4702f0 100644
--- a/setup.py
+++ b/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',
--
GitLab