Replaced jsonfield2 with jsonfield (#791)

* Replaced jsonfield2 with jsonfield

We are going to replace jsonfield2 with jsonfield as the earlier one has archived and merged back in the latter one.

* Version Bump

CHANGELOG.rst

@@ -14,6 +14,10 @@ Change Log
 Unreleased
 ~~~~~~~~~~
 
+[3.6.4] - 2021-02-24
+~~~~~~~~~~~~~~~~~~~~
+* Switched from jsonfield2 to jsonfield as the earlier one has archived and merged back in the latter one.
+
 [3.6.3] - 2021-02-23
 ~~~~~~~~~~~~~~~~~~~~
 * Add a script to generate obscure_user_ids for proctoring vendors to use.

edx_proctoring/__init__.py

@@ -3,6 +3,6 @@
 """
 
 # Be sure to update the version number in edx_proctoring/package.json
-__version__ = '3.6.3'
+__version__ = '3.6.4'
 
 default_app_config = 'edx_proctoring.apps.EdxProctoringConfig'  # pylint: disable=invalid-name

package.json

@@ -2,7 +2,7 @@
   "name": "@edx/edx-proctoring",
   "//": "Be sure to update the version number in edx_proctoring/__init__.py",
   "//": "Note that the version format is slightly different than that of the Python version when using prereleases.",
-  "version": "3.6.3",
+  "version": "3.6.4",
   "main": "edx_proctoring/static/index.js",
   "repository": {
     "type": "git",

requirements/base.in

@@ -6,7 +6,7 @@ Django>=2.2
 django-model-utils
 djangorestframework
 django-ipware>=1.1.0
-jsonfield2
+jsonfield
 pytz>=2018
 pycryptodomex>=3.4.7
 django-crum

requirements/base.txt

@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-amqp==5.0.3
+amqp==5.0.5
     # via kombu
 appdirs==1.4.4
     # via fs
@@ -16,7 +16,7 @@ celery==5.0.4
     #   event-tracking
 certifi==2020.12.5
     # via requests
-cffi==1.14.4
+cffi==1.14.5
     # via cryptography
 chardet==4.0.0
     # via requests
@@ -32,7 +32,7 @@ click==7.1.2
     #   click-didyoumean
     #   click-plugins
     #   click-repl
-cryptography==3.3.1
+cryptography==3.4.6
     # via pyjwt
 django-crum==0.7.9
     # via
@@ -51,7 +51,7 @@ django-waffle==2.1.0
     #   edx-drf-extensions
 django-webpack-loader==0.7.0
     # via -r requirements/base.in
-django==2.2.17
+django==2.2.19
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/base.in
@@ -63,7 +63,7 @@ django==2.2.17
     #   edx-drf-extensions
     #   edx-when
     #   event-tracking
-    #   jsonfield2
+    #   jsonfield
     #   rest-condition
 djangorestframework==3.12.2
     # via
@@ -78,11 +78,11 @@ edx-django-utils==3.13.0
     #   edx-drf-extensions
     #   edx-rest-api-client
     #   edx-when
-edx-drf-extensions==6.4.0
+edx-drf-extensions==6.5.0
     # via
     #   -r requirements/base.in
     #   edx-when
-edx-opaque-keys==2.1.1
+edx-opaque-keys==2.2.0
     # via
     #   -r requirements/base.in
     #   edx-drf-extensions
@@ -99,10 +99,8 @@ future==0.18.2
     # via pyjwkest
 idna==2.10
     # via requests
-jsonfield2==3.0.3
-    # via
-    #   -c requirements/constraints.txt
-    #   -r requirements/base.in
+jsonfield==3.1.0
+    # via -r requirements/base.in
 kombu==5.0.2
     # via celery
 lxml==4.6.2
@@ -113,13 +111,13 @@ newrelic==6.0.1.155
     # via edx-django-utils
 pbr==5.5.1
     # via stevedore
-prompt-toolkit==3.0.14
+prompt-toolkit==3.0.16
     # via click-repl
 psutil==5.8.0
     # via edx-django-utils
 pycparser==2.20
     # via cffi
-pycryptodomex==3.9.9
+pycryptodomex==3.10.1
     # via
     #   -r requirements/base.in
     #   pyjwkest
@@ -129,7 +127,7 @@ pyjwt[crypto]==1.7.1
     # via
     #   drf-jwt
     #   edx-rest-api-client
-pymongo==3.11.2
+pymongo==3.11.3
     # via
     #   edx-opaque-keys
     #   event-tracking
@@ -138,7 +136,7 @@ python-dateutil==2.8.1
     #   -r requirements/base.in
     #   edx-drf-extensions
     #   xblock
-pytz==2020.5
+pytz==2021.1
     # via
     #   -r requirements/base.in
     #   celery
@@ -163,9 +161,7 @@ semantic-version==2.8.5
 six==1.15.0
     # via
     #   click-repl
-    #   cryptography
     #   edx-drf-extensions
-    #   edx-opaque-keys
     #   event-tracking
     #   fs
     #   pyjwkest
@@ -189,7 +185,7 @@ wcwidth==0.2.5
     # via prompt-toolkit
 web-fragments==1.0.0
     # via xblock
-webob==1.8.6
+webob==1.8.7
     # via xblock
 xblock==1.4.0
     # via edx-when

requirements/celery50.txt

@@ -1,9 +1,9 @@
-amqp==5.0.3
+amqp==5.0.5
 billiard==3.6.3.0
 celery==5.0.4
 click-didyoumean==0.0.3
 click-repl==0.1.6
 click==7.1.2
 kombu==5.0.2
-prompt-toolkit==3.0.14
+prompt-toolkit==3.0.16
 vine==5.0.0

requirements/ci.txt

@@ -22,7 +22,7 @@ filelock==3.0.12
     #   virtualenv
 idna==2.10
     # via requests
-packaging==20.8
+packaging==20.9
     # via tox
 pluggy==0.13.1
     # via tox
@@ -40,11 +40,11 @@ toml==0.10.2
     # via tox
 tox-battery==0.6.1
     # via -r requirements/ci.in
-tox==3.21.2
+tox==3.22.0
     # via
     #   -r requirements/ci.in
     #   tox-battery
 urllib3==1.26.3
     # via requests
-virtualenv==20.4.0
+virtualenv==20.4.2
     # via tox

requirements/constraints.txt

@@ -10,10 +10,6 @@
 
 # Common constraints for edx repos
 -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
-
-# jsonfield2 > 3.0.3 dropped support for python 3.5
-jsonfield2==3.0.3
-
 
 # pinning it to latest release.
 celery==5.0.4

requirements/dev.txt

@@ -6,16 +6,14 @@
 #
 appdirs==1.4.4
     # via virtualenv
-astroid==2.4.2
+astroid==2.5
     # via
     #   pylint
     #   pylint-celery
-bleach==3.2.3
+bleach==3.3.0
     # via readme-renderer
 certifi==2020.12.5
     # via requests
-cffi==1.14.4
-    # via cryptography
 chardet==4.0.0
     # via
     #   diff-cover
@@ -28,17 +26,15 @@ click==7.1.2
     #   code-annotations
     #   edx-lint
     #   pip-tools
-code-annotations==1.0.2
+code-annotations==1.1.0
     # via edx-lint
 colorama==0.4.4
     # via twine
-cryptography==3.3.1
-    # via secretstorage
-diff-cover==4.2.0
+diff-cover==4.2.1
     # via -r requirements/dev.in
 distlib==0.3.1
     # via virtualenv
-django==2.2.17
+django==2.2.19
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/dev.in
@@ -50,7 +46,7 @@ docutils==0.16
     # via readme-renderer
 edx-i18n-tools==0.5.3
     # via -r requirements/dev.in
-edx-lint==3.0.2
+edx-lint==4.0.1
     # via
     #   -r requirements/dev.in
     #   -r requirements/quality.in
@@ -66,34 +62,30 @@ isort==5.7.0
     # via
     #   -r requirements/quality.in
     #   pylint
-jeepney==0.6.0
-    # via
-    #   keyring
-    #   secretstorage
 jinja2-pluralize==0.3.0
     # via diff-cover
-jinja2==2.11.2
+jinja2==2.11.3
     # via
     #   code-annotations
     #   diff-cover
     #   jinja2-pluralize
 keyring==22.0.1
     # via twine
-lazy-object-proxy==1.4.3
+lazy-object-proxy==1.5.2
     # via astroid
 markupsafe==1.1.1
     # via jinja2
 mccabe==0.6.1
     # via pylint
-packaging==20.8
+packaging==20.9
     # via
     #   bleach
     #   tox
 path.py==12.5.0
     # via
     #   -r requirements/dev.in
     #   edx-i18n-tools
-path==15.0.1
+path==15.1.2
     # via path.py
 pbr==5.5.1
     # via stevedore
@@ -111,11 +103,9 @@ py==1.10.0
     # via tox
 pycodestyle==2.6.0
     # via -r requirements/quality.in
-pycparser==2.20
-    # via cffi
 pydocstyle==5.1.1
     # via -r requirements/quality.in
-pygments==2.7.4
+pygments==2.8.0
     # via
     #   diff-cover
     #   readme-renderer
@@ -127,7 +117,7 @@ pylint-plugin-utils==0.6
     # via
     #   pylint-celery
     #   pylint-django
-pylint==2.6.0
+pylint==2.7.0
     # via
     #   edx-lint
     #   pylint-celery
@@ -137,7 +127,7 @@ pyparsing==2.4.7
     # via packaging
 python-slugify==4.0.1
     # via code-annotations
-pytz==2020.5
+pytz==2021.1
     # via django
 pyyaml==5.4.1
     # via
@@ -153,13 +143,9 @@ requests==2.25.1
     #   twine
 rfc3986==1.4.0
     # via twine
-secretstorage==3.3.0
-    # via keyring
 six==1.15.0
     # via
-    #   astroid
     #   bleach
-    #   cryptography
     #   edx-i18n-tools
     #   edx-lint
     #   readme-renderer
@@ -179,19 +165,19 @@ toml==0.10.2
     #   tox
 tox-battery==0.6.1
     # via -r requirements/dev.in
-tox==3.21.2
+tox==3.22.0
     # via
     #   -r requirements/dev.in
     #   tox-battery
-tqdm==4.56.0
+tqdm==4.57.0
     # via twine
 twine==3.3.0
     # via
     #   -r requirements/dev.in
     #   -r requirements/quality.in
 urllib3==1.26.3
     # via requests
-virtualenv==20.4.0
+virtualenv==20.4.2
     # via tox
 webencodings==0.5.1
     # via bleach