replaced jsonfield with jsonfield2

requirements/constraints.txt

@@ -71,11 +71,17 @@ freezegun==0.3.12
 # zipp 2.0.0 requires Python >= 3.6
 zipp==1.0.0
 
-# jsonfield2 3.1.0 requires Django 2.2
-jsonfield2==3.0.3
-
 # django-storages==1.9 breaks contentstore imports
 django-storages==1.8
 
 # mock 4+ requires Python 3.6+
 mock<4
+
+# jsonfield2 3.1.0 drops support for python 3.5
+jsonfield2<3.1.0
+
+# mock version 4.0.0 drops support for python 3.5
+mock<4.0.0
+
+# django-storages version 1.9 drops support for boto storage backend.
+django-storages<1.9

requirements/edx/base.in

@@ -99,7 +99,7 @@ gunicorn
 help-tokens
 html5lib                            # HTML parser, used for capa problems
 ipaddress                           # Ip network support for Embargo feature
-jsonfield                           # Django model field for validated JSON; used in several apps
+jsonfield2                          # Django model field for validated JSON; used in several apps
 laboratory                          # Library for testing that code refactors/infrastructure changes produce identical results
 mailsnake                           # Needed for mailchimp (mailing djangoapp)
 mako==1.0.2                         # Primary template language used for server-side page rendering

requirements/edx/base.txt

@@ -144,8 +144,7 @@ itypes==1.1.0             # via coreapi
 jinja2==2.11.1            # via code-annotations, coreschema
 jmespath==0.9.4           # via boto3, botocore
 jsondiff==1.2.0           # via edx-enterprise
-jsonfield2==3.0.3         # via edx-celeryutils, edx-enterprise, edx-proctoring, edx-submissions
-jsonfield==2.0.2
+jsonfield2==3.0.3
 kombu==3.0.37             # via celery
 laboratory==1.0.2
 lazy==1.4
@@ -172,7 +171,7 @@ nodeenv==1.3.5
 numpy==1.18.1             # via scipy
 git+https://github.com/joestump/python-oauth2.git@b94f69b1ad195513547924e380d9265133e995fa#egg=oauth2
 oauthlib==2.1.0
-git+https://github.com/edx/edx-ora2.git@2.6.8#egg=ora2==2.6.8
+git+https://github.com/edx/edx-ora2.git@2.6.9#egg=ora2==2.6.9
 packaging==20.1           # via drf-yasg
 path.py==12.4.0           # via edx-enterprise, edx-i18n-tools
 path==13.1.0

requirements/edx/development.txt

@@ -172,7 +172,6 @@ jinja2==2.11.1
 jmespath==0.9.4
 jsondiff==1.2.0
 jsonfield2==3.0.3
-jsonfield==2.0.2
 jsonschema==3.2.0         # via sphinxcontrib-openapi
 kombu==3.0.37
 laboratory==1.0.2
@@ -205,7 +204,7 @@ nodeenv==1.3.5
 numpy==1.18.1
 git+https://github.com/joestump/python-oauth2.git@b94f69b1ad195513547924e380d9265133e995fa#egg=oauth2
 oauthlib==2.1.0
-git+https://github.com/edx/edx-ora2.git@2.6.8#egg=ora2==2.6.8
+git+https://github.com/edx/edx-ora2.git@2.6.9#egg=ora2==2.6.9
 packaging==20.1
 pandas==0.22.0
 path.py==12.4.0
@@ -316,7 +315,7 @@ unidiff==0.5.5
 uritemplate==3.0.1
 urllib3==1.25.8
 user-util==0.1.5
-virtualenv==20.0.0
+virtualenv==20.0.1
 voluptuous==0.11.7
 vulture==1.3
 watchdog==0.10.2

requirements/edx/github.in

@@ -90,7 +90,7 @@ git+https://github.com/edx/bridgekeeper.git@2423e8d8788c2132ebeec509e1a7b17e1f5b
 # Our libraries:
 -e git+https://github.com/edx/codejail.git@4127fc4bd5775cc72aee8d7f0a70e31405e22439#egg=codejail
 -e git+https://github.com/edx/acid-block.git@98aecba94ecbfa934e2d00262741c0ea9f557fc9#egg=acid-xblock
-git+https://github.com/edx/edx-ora2.git@2.6.8#egg=ora2==2.6.8
+git+https://github.com/edx/edx-ora2.git@2.6.9#egg=ora2==2.6.9
 git+https://github.com/edx/crowdsourcehinter.git@a7ffc85b134b7d8909bf1fefd23dbdb8eb28e467#egg=crowdsourcehinter-xblock==0.2
 -e git+https://github.com/edx/RateXBlock.git@2.0#egg=rate-xblock
 -e git+https://github.com/edx/DoneXBlock.git@2.0.1#egg=done-xblock

requirements/edx/testing.txt

@@ -166,7 +166,6 @@ jinja2==2.11.1
 jmespath==0.9.4
 jsondiff==1.2.0
 jsonfield2==3.0.3
-jsonfield==2.0.2
 kombu==3.0.37
 laboratory==1.0.2
 lazy-object-proxy==1.4.3  # via astroid
@@ -196,7 +195,7 @@ nodeenv==1.3.5
 numpy==1.18.1
 git+https://github.com/joestump/python-oauth2.git@b94f69b1ad195513547924e380d9265133e995fa#egg=oauth2
 oauthlib==2.1.0
-git+https://github.com/edx/edx-ora2.git@2.6.8#egg=ora2==2.6.8
+git+https://github.com/edx/edx-ora2.git@2.6.9#egg=ora2==2.6.9
 packaging==20.1
 pandas==0.22.0
 path.py==12.4.0
@@ -294,7 +293,7 @@ unidiff==0.5.5
 uritemplate==3.0.1
 urllib3==1.25.8
 user-util==0.1.5
-virtualenv==20.0.0        # via tox
+virtualenv==20.0.1        # via tox
 voluptuous==0.11.7
 watchdog==0.10.2
 wcwidth==0.1.8            # via pytest