Merge pull request #104 from edx/BOM-1068

Replaced jsonfield with jsonfield2
openedx · Jan 30, 2020 · 4a0d1d5 · 4a0d1d5
2 parents 1a5c001 + 9e20fe8
commit 4a0d1d5
Show file tree

Hide file tree

Showing 15 changed files with 137 additions and 152 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,25 +2,20 @@ language: python
 dist: latest
 
 python:
-  - 2.7
   - 3.5
 
 env:
-  - TOXENV=django111-drf37
-  - TOXENV=django111-drf38
   - TOXENV=django111-drf39
+  - TOXENV=django111-drf310
   - TOXENV=django111-drflatest
-  - TOXENV=django20-drf37
-  - TOXENV=django20-drf38
   - TOXENV=django20-drf39
+  - TOXENV=django20-drf310
   - TOXENV=django20-drflatest
-  - TOXENV=django21-drf37
-  - TOXENV=django21-drf38
   - TOXENV=django21-drf39
+  - TOXENV=django21-drf310
   - TOXENV=django21-drflatest
-  - TOXENV=django22-drf37
-  - TOXENV=django22-drf38
   - TOXENV=django22-drf39
+  - TOXENV=django22-drf310
   - TOXENV=django22-drflatest
 
 matrix:
@@ -29,31 +24,6 @@ matrix:
       env: TOXENV=quality
     - python: 3.5
       env: TOXENV=docs
-  exclude:
-    - python: 2.7
-      env: TOXENV=django20-drf37
-    - python: 2.7
-      env: TOXENV=django20-drf38
-    - python: 2.7
-      env: TOXENV=django20-drf39
-    - python: 2.7
-      env: TOXENV=django20-drflatest
-    - python: 2.7
-      env: TOXENV=django21-drf37
-    - python: 2.7
-      env: TOXENV=django21-drf38
-    - python: 2.7
-      env: TOXENV=django21-drf39
-    - python: 2.7
-      env: TOXENV=django21-drflatest
-    - python: 2.7
-      env: TOXENV=django22-drf37
-    - python: 2.7
-      env: TOXENV=django22-drf38
-    - python: 2.7
-      env: TOXENV=django22-drf39
-    - python: 2.7
-      env: TOXENV=django22-drflatest
 
 install:
   - pip install -r requirements/test.txt

diff --git a/requirements/base.in b/requirements/base.in
@@ -1,9 +1,11 @@
 # Base Requirements
 
+-c constraints.txt
+
 Django>=1.11,<2.3
 django-model-utils>=2.3.1
 
 # Use the same DRF version as edx-platform
 djangorestframework>=3.2.0,<3.10
-jsonfield>=2.0.2,<3.0.0
+jsonfield2
 pytz
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -4,8 +4,9 @@
 #
 #    make upgrade
 #
-django-model-utils==3.2.0
-django==1.11.26
+django-model-utils==4.0.0
+django==2.2.9
 djangorestframework==3.9.4
-jsonfield==2.0.2
+jsonfield2==3.0.3
 pytz==2019.3
+sqlparse==0.3.0           # via django
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -18,3 +18,9 @@ pylint-django>=0.11.1;python_version<"3.0"  # The last pylint-django to support
 pylint-django>=2.0.11;python_version>="3.0"
 astroid<2.4,>=2.3.0;python_version>="3.0"
 astroid>=1.6.6;python_version<="3.0"
+
+#jsonfield2 version 3.1.0 drops support for python3.5
+jsonfield2==3.0.3
+
+# zipp 2.0.0 requires Python >= 3.6
+zipp<2.0.0
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -5,80 +5,75 @@
 #    make upgrade
 #
 alabaster==0.7.12
-astroid==1.6.6 ; python_version <= "3.0"
-atomicwrites==1.3.0
+astroid==2.3.3 ; python_version >= "3.0"
 attrs==19.3.0
-babel==2.7.0
-backports.functools-lru-cache==1.6.1
-certifi==2019.9.11
+babel==2.8.0
+certifi==2019.11.28
 chardet==3.0.4
 click-log==0.3.2
 click==7.0
-configparser==4.0.2
-contextlib2==0.6.0.post1
-coverage==4.5.4
-ddt==1.2.1
-django-model-utils==3.2.0
+coverage==5.0.3
+ddt==1.2.2
+django-model-utils==4.0.0
 django-nose==1.4.6
-django==1.11.26
+django==2.2.9
 djangorestframework==3.9.4
-docutils==0.15.2
+docutils==0.16
 edx-lint==1.4.1
-enum34==1.1.6             # via astroid
 factory-boy==2.12.0
-faker==2.0.4
+faker==4.0.0
 filelock==3.0.12
-freezegun==0.3.12
-funcsigs==1.0.2
-futures==3.3.0 ; python_version == "2.7"
+freezegun==0.3.14
 idna==2.8
-imagesize==1.1.0
-importlib-metadata==0.23
-ipaddress==1.0.23
+imagesize==1.2.0
+importlib-metadata==1.5.0
 isort==4.3.21
-jinja2==2.10.3
-jsonfield==2.0.2
+jinja2==2.11.0
+jsonfield2==3.0.3
 lazy-object-proxy==1.4.3  # via astroid
 markupsafe==1.1.1
-mccabe==0.6.1             # via pylint
+mccabe==0.6.1
 mock==3.0.5
-more-itertools==5.0.0
+more-itertools==8.2.0
 nose==1.3.7
-packaging==19.2
-pathlib2==2.3.5
+packaging==20.1
 pluggy==0.13.1
 pockets==0.9.1
-py==1.8.0
+py==1.8.1
 pycodestyle==2.5.0
-pygments==2.4.2
+pygments==2.5.2
 pylint-celery==0.3
-pylint-django==0.11.1 ; python_version < "3.0"
+pylint-django==2.0.11 ; python_version >= "3.0"
 pylint-plugin-utils==0.6
-pylint==1.9.5 ; python_version < "3.0"
-pyparsing==2.4.5
+pylint==2.4.2 ; python_version >= "3.0"
+pyparsing==2.4.6
 pytest-cov==2.8.1
-pytest-django==3.7.0
-pytest==4.6.6
+pytest-django==3.8.0
+pytest==5.3.5
 python-dateutil==2.8.1
 pytz==2019.3
 requests==2.22.0
-scandir==1.10.0
-singledispatch==3.4.0.3   # via astroid, pylint
-six==1.13.0
+six==1.14.0
 snowballstemmer==2.0.0
 sphinx-rtd-theme==0.4.3
-sphinx==1.8.5
+sphinx==2.3.1
+sphinxcontrib-applehelp==1.0.1
+sphinxcontrib-devhelp==1.0.1
+sphinxcontrib-htmlhelp==1.0.2
+sphinxcontrib-jsmath==1.0.1
 sphinxcontrib-napoleon==0.7
-sphinxcontrib-websupport==1.1.2
+sphinxcontrib-qthelp==1.0.2
+sphinxcontrib-serializinghtml==1.1.3
+sqlparse==0.3.0
 text-unidecode==1.3
 toml==0.10.0
-tox==3.14.1
-typing==3.7.4.1
-urllib3==1.25.7
-virtualenv==16.7.8
-wcwidth==0.1.7
+tox==3.14.3
+typed-ast==1.4.1          # via astroid
+urllib3==1.25.8
+virtualenv==16.7.9
+wcwidth==0.1.8
 wrapt==1.11.2             # via astroid
-zipp==0.6.0
+zipp==1.1.0
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/requirements/docs.txt b/requirements/docs.txt
@@ -5,28 +5,32 @@
 #    make upgrade
 #
 alabaster==0.7.12         # via sphinx
-babel==2.7.0              # via sphinx
-certifi==2019.9.11        # via requests
+babel==2.8.0              # via sphinx
+certifi==2019.11.28       # via requests
 chardet==3.0.4            # via requests
-docutils==0.15.2          # via sphinx
+docutils==0.16            # via sphinx
 idna==2.8                 # via requests
-imagesize==1.1.0          # via sphinx
-jinja2==2.10.3            # via sphinx
+imagesize==1.2.0          # via sphinx
+jinja2==2.11.0            # via sphinx
 markupsafe==1.1.1         # via jinja2
-packaging==19.2           # via sphinx
+packaging==20.1           # via sphinx
 pockets==0.9.1            # via sphinxcontrib-napoleon
-pygments==2.4.2           # via sphinx
-pyparsing==2.4.5          # via packaging
+pygments==2.5.2           # via sphinx
+pyparsing==2.4.6          # via packaging
 pytz==2019.3              # via babel
 requests==2.22.0          # via sphinx
-six==1.13.0               # via packaging, pockets, sphinx, sphinxcontrib-napoleon
+six==1.14.0               # via packaging, pockets, sphinxcontrib-napoleon
 snowballstemmer==2.0.0    # via sphinx
 sphinx-rtd-theme==0.4.3
-sphinx==1.8.5
+sphinx==2.3.1
+sphinxcontrib-applehelp==1.0.1  # via sphinx
+sphinxcontrib-devhelp==1.0.1  # via sphinx
+sphinxcontrib-htmlhelp==1.0.2  # via sphinx
+sphinxcontrib-jsmath==1.0.1  # via sphinx
 sphinxcontrib-napoleon==0.7
-sphinxcontrib-websupport==1.1.2  # via sphinx
-typing==3.7.4.1           # via sphinx
-urllib3==1.25.7           # via requests
+sphinxcontrib-qthelp==1.0.2  # via sphinx
+sphinxcontrib-serializinghtml==1.1.3  # via sphinx
+urllib3==1.25.8           # via requests
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt
@@ -5,5 +5,5 @@
 #    make upgrade
 #
 click==7.0                # via pip-tools
-pip-tools==4.3.0
-six==1.13.0               # via pip-tools
+pip-tools==4.4.0
+six==1.14.0               # via pip-tools
diff --git a/requirements/test.txt b/requirements/test.txt
@@ -5,73 +5,70 @@
 #    make upgrade
 #
 alabaster==0.7.12
-astroid==1.6.6 ; python_version <= "3.0"  # via pylint-celery
-atomicwrites==1.3.0       # via pytest
+astroid==2.3.3 ; python_version >= "3.0"  # via pylint, pylint-celery
 attrs==19.3.0             # via pytest
-babel==2.7.0
-backports.functools-lru-cache==1.6.1  # via isort
-certifi==2019.9.11
+babel==2.8.0
+certifi==2019.11.28
 chardet==3.0.4
 click-log==0.3.2          # via edx-lint
 click==7.0                # via click-log, edx-lint
-configparser==4.0.2       # via importlib-metadata
-contextlib2==0.6.0.post1  # via importlib-metadata
-coverage==4.5.4           # via pytest-cov
-ddt==1.2.1
-django-model-utils==3.2.0
+coverage==5.0.3           # via pytest-cov
+ddt==1.2.2
+django-model-utils==4.0.0
 django-nose==1.4.6
-docutils==0.15.2
+docutils==0.16
 edx-lint==1.4.1
 factory-boy==2.12.0
-faker==2.0.4              # via factory-boy
+faker==4.0.0              # via factory-boy
 filelock==3.0.12          # via tox
-freezegun==0.3.12
-funcsigs==1.0.2           # via mock, pytest
-futures==3.3.0 ; python_version == "2.7"  # via isort
+freezegun==0.3.14
 idna==2.8
-imagesize==1.1.0
-importlib-metadata==0.23  # via pluggy, pytest, tox
-ipaddress==1.0.23         # via faker
+imagesize==1.2.0
+importlib-metadata==1.5.0  # via pluggy, pytest, tox
 isort==4.3.21
-jinja2==2.10.3
-jsonfield==2.0.2
+jinja2==2.11.0
+jsonfield2==3.0.3
 markupsafe==1.1.1
+mccabe==0.6.1             # via pylint
 mock==3.0.5
-more-itertools==5.0.0     # via pytest, zipp
+more-itertools==8.2.0     # via pytest
 nose==1.3.7
-packaging==19.2
-pathlib2==2.3.5           # via importlib-metadata, pytest, pytest-django
+packaging==20.1
 pluggy==0.13.1            # via pytest, tox
 pockets==0.9.1
-py==1.8.0                 # via pytest, tox
+py==1.8.1                 # via pytest, tox
 pycodestyle==2.5.0
-pygments==2.4.2
+pygments==2.5.2
 pylint-celery==0.3        # via edx-lint
-pylint-django==0.11.1 ; python_version < "3.0"  # via edx-lint
+pylint-django==2.0.11 ; python_version >= "3.0"  # via edx-lint
 pylint-plugin-utils==0.6  # via pylint-celery, pylint-django
-pylint==1.9.5 ; python_version < "3.0"  # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
-pyparsing==2.4.5
+pylint==2.4.2 ; python_version >= "3.0"  # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
+pyparsing==2.4.6
 pytest-cov==2.8.1
-pytest-django==3.7.0
-pytest==4.6.6             # via pytest-cov, pytest-django
+pytest-django==3.8.0
+pytest==5.3.5             # via pytest-cov, pytest-django
 python-dateutil==2.8.1
 pytz==2019.3
 requests==2.22.0
-scandir==1.10.0           # via pathlib2
-six==1.13.0
+six==1.14.0
 snowballstemmer==2.0.0
 sphinx-rtd-theme==0.4.3
-sphinx==1.8.5
+sphinx==2.3.1
+sphinxcontrib-applehelp==1.0.1
+sphinxcontrib-devhelp==1.0.1
+sphinxcontrib-htmlhelp==1.0.2
+sphinxcontrib-jsmath==1.0.1
 sphinxcontrib-napoleon==0.7
-sphinxcontrib-websupport==1.1.2
+sphinxcontrib-qthelp==1.0.2
+sphinxcontrib-serializinghtml==1.1.3
+sqlparse==0.3.0
 text-unidecode==1.3       # via faker
 toml==0.10.0              # via tox
-tox==3.14.1
-typing==3.7.4.1
-urllib3==1.25.7
-virtualenv==16.7.8        # via tox
-wcwidth==0.1.7            # via pytest
-zipp==0.6.0               # via importlib-metadata
+tox==3.14.3
+urllib3==1.25.8
+virtualenv==16.7.9        # via tox
+wcwidth==0.1.8            # via pytest
+zipp==1.1.0               # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/settings.py b/settings.py
@@ -63,7 +63,7 @@
     'submissions'
 )
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = (
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware'