Merge pull request #186 from edx/azarembok/update-drf

PROD-855: Update pinned version of djangorestframework.

edxval/tests/test_serializers.py

@@ -98,7 +98,7 @@ def test_invalid_course_id(self):
         )
         self.assertFalse(serializer.is_valid())
         self.assertEqual(
-            str(serializer.errors['courses'][0]),
+            str(serializer.errors['courses']['course_id'][0]),
             "Ensure this value has at most 255 characters (it has 300)."
         )
 

requirements/base.in

@@ -4,7 +4,7 @@ boto
 Django>=1.11,<2
 django-model-utils
 edx-django-oauth2-provider
-djangorestframework==3.7.7
+djangorestframework==3.9.4
 edx-drf-extensions
 -e git+https://github.com/edx/django-rest-framework-oauth.git@0a43e8525f1e3048efe4bc70c03de308a277197c#egg=djangorestframework-oauth==1.1.1
 django-storages

requirements/dev.txt

@@ -7,86 +7,100 @@
 -e git+https://github.com/edx/django-rest-framework-oauth.git@0a43e8525f1e3048efe4bc70c03de308a277197c#egg=djangorestframework-oauth==1.1.1
 appdirs==1.4.3            # via fs
 argparse==1.4.0           # via caniusepython3
-astroid==1.5.3            # via pylint, pylint-celery
-attrs==19.1.0             # via packaging
-backports.functools-lru-cache==1.5  # via caniusepython3
+astroid==1.6.6            # via pylint, pylint-celery
+backports.functools-lru-cache==1.5  # via astroid, caniusepython3, isort, pylint
+backports.os==0.1.1       # via fs
 boto==2.49.0
 caniusepython3==7.1.0
-certifi==2019.6.16        # via requests
+certifi==2019.9.11        # via requests, urllib3
+cffi==1.13.1              # via cryptography
 chardet==3.0.4            # via pysrt, requests
 click-log==0.3.2          # via edx-lint
 click==7.0                # via click-log, edx-lint, pip-tools
+configparser==4.0.2       # via importlib-metadata, pydocstyle, pylint
+contextlib2==0.6.0.post1  # via importlib-metadata
 coverage==4.5.4
 coveralls==1.8.2
+cryptography==2.8         # via pyopenssl, urllib3
 ddt==1.2.1
-diff-cover==2.3.0
+diff-cover==2.4.0
 distlib==0.2.9.post0      # via caniusepython3
 django-model-utils==3.2.0
 django-nose==1.4.6
-django-storages==1.7.1
+django-storages==1.7.2
 django-waffle==0.17.0     # via edx-django-utils, edx-drf-extensions
-django==1.11.23
+django==1.11.25
 djangorestframework-jwt==1.11.0  # via edx-drf-extensions
-djangorestframework==3.7.7
+djangorestframework==3.9.4
 docopt==0.6.2             # via coveralls
 edx-django-oauth2-provider==1.3.5
-edx-django-utils==2.0.0   # via edx-drf-extensions
-edx-drf-extensions==2.4.0
-edx-lint==1.3.0
-edx-opaque-keys==1.0.1    # via edx-drf-extensions
+edx-django-utils==2.0.1   # via edx-drf-extensions
+edx-drf-extensions==2.4.2
+edx-lint==1.4.1
+edx-opaque-keys==2.0.0    # via edx-drf-extensions
 enum34==1.1.6
 filelock==3.0.12          # via tox
-fs==2.4.10
-future==0.17.1            # via pyjwkest
-idna==2.8                 # via requests
-importlib-metadata==0.19  # via pluggy, tox
+fs==2.4.11
+funcsigs==1.0.2           # via mock
+future==0.18.1            # via backports.os, pyjwkest
+futures==3.3.0 ; python_version <= "3"
+idna==2.8                 # via requests, urllib3
+importlib-metadata==0.23  # via pluggy, tox
 inflect==2.1.0            # via jinja2-pluralize
+ipaddress==1.0.23         # via cryptography, urllib3
 isort==4.3.21
 jinja2-pluralize==0.3.0   # via diff-cover
-jinja2==2.10.1            # via diff-cover, jinja2-pluralize
-lazy-object-proxy==1.4.1  # via astroid
+jinja2==2.10.3            # via diff-cover, jinja2-pluralize
+lazy-object-proxy==1.4.2  # via astroid
 lxml==4.4.1
 markupsafe==1.1.1         # via jinja2
 mccabe==0.6.1             # via pylint
 mock==3.0.5
-newrelic==5.0.2.126       # via edx-django-utils
+more-itertools==5.0.0     # via zipp
+newrelic==5.2.1.129       # via edx-django-utils
 nose==1.3.7               # via django-nose
-packaging==19.1           # via caniusepython3, tox
-pbr==5.4.2                # via stevedore
-pillow==6.1.0
-pip-tools==4.0.0
-pluggy==0.12.0            # via tox
+packaging==19.2           # via caniusepython3, tox
+pathlib2==2.3.5           # via importlib-metadata
+pbr==5.4.3                # via stevedore
+pillow==6.2.1
+pip-tools==4.2.0
+pluggy==0.13.0            # via tox
 psutil==1.2.1             # via edx-django-utils, edx-drf-extensions
 py==1.8.0                 # via tox
 pycodestyle==2.5.0
-pycryptodomex==3.8.2      # via pyjwkest
-pydocstyle==4.0.1
+pycparser==2.19           # via cffi
+pycryptodomex==3.9.0      # via pyjwkest
+pydocstyle==3.0.0
 pygments==2.4.2           # via diff-cover
 pyjwkest==1.3.2           # via edx-drf-extensions
 pyjwt==1.7.1              # via djangorestframework-jwt
 pylint-celery==0.3        # via edx-lint
-pylint-django==0.7.2      # via edx-lint
-pylint-plugin-utils==0.5  # via pylint-celery, pylint-django
-pylint==1.7.6             # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
+pylint-django==0.11.1     # via edx-lint
+pylint-plugin-utils==0.6  # via pylint-celery, pylint-django
+pylint==1.9.5             # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
 pymongo==3.9.0            # via edx-opaque-keys
+pyopenssl==19.0.0         # via urllib3
 pyparsing==2.4.2          # via packaging
 pysrt==1.1.1
 python-dateutil==2.8.0    # via edx-drf-extensions
-pytz==2019.2              # via django, fs
+pytz==2019.3              # via django, fs
 requests==2.22.0          # via caniusepython3, coveralls, edx-drf-extensions, pyjwkest
 rest-condition==1.0.3     # via edx-drf-extensions
-semantic-version==2.6.0   # via edx-drf-extensions
+scandir==1.10.0           # via pathlib2
+semantic-version==2.8.2   # via edx-drf-extensions
 shortuuid==0.5.0          # via edx-django-oauth2-provider
-six==1.12.0               # via astroid, diff-cover, edx-drf-extensions, edx-lint, edx-opaque-keys, fs, mock, packaging, pip-tools, pyjwkest, pylint, python-dateutil, stevedore, tox
-snowballstemmer==1.9.0    # via pydocstyle
-stevedore==1.30.1         # via edx-opaque-keys
+singledispatch==3.4.0.3   # via astroid, pylint
+six==1.12.0               # via astroid, cryptography, diff-cover, edx-drf-extensions, edx-lint, edx-opaque-keys, fs, mock, more-itertools, packaging, pathlib2, pip-tools, pydocstyle, pyjwkest, pylint, pyopenssl, python-dateutil, singledispatch, stevedore, tox
+snowballstemmer==2.0.0    # via pydocstyle
+stevedore==1.31.0         # via edx-opaque-keys
 toml==0.10.0              # via tox
 tox-battery==0.5.1
-tox==3.13.2
-urllib3==1.25.3           # via requests
-virtualenv==16.7.3        # via tox
+tox==3.14.0
+typing==3.7.4.1           # via fs
+urllib3[secure]==1.25.6   # via coveralls, requests
+virtualenv==16.7.7        # via tox
 wrapt==1.11.2             # via astroid
-zipp==0.5.2               # via importlib-metadata
+zipp==0.6.0               # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
-# setuptools==41.1.0        # via caniusepython3, fs
+# setuptools==41.4.0        # via caniusepython3, fs

requirements/quality.txt

@@ -7,68 +7,73 @@
 -e git+https://github.com/edx/django-rest-framework-oauth.git@0a43e8525f1e3048efe4bc70c03de308a277197c#egg=djangorestframework-oauth==1.1.1
 appdirs==1.4.3            # via fs
 argparse==1.4.0           # via caniusepython3
-astroid==1.5.3            # via pylint, pylint-celery
-attrs==19.1.0             # via packaging
-backports.functools-lru-cache==1.5  # via caniusepython3
+astroid==1.6.6            # via pylint, pylint-celery
+backports.functools-lru-cache==1.5  # via astroid, caniusepython3, isort, pylint
+backports.os==0.1.1       # via fs
 boto==2.49.0
 caniusepython3==7.1.0
-certifi==2019.6.16        # via requests
+certifi==2019.9.11        # via requests
 chardet==3.0.4            # via pysrt, requests
 click-log==0.3.2          # via edx-lint
 click==7.0                # via click-log, edx-lint
+configparser==4.0.2       # via pydocstyle, pylint
 coverage==4.5.4
 ddt==1.2.1
 distlib==0.2.9.post0      # via caniusepython3
 django-model-utils==3.2.0
 django-nose==1.4.6
-django-storages==1.7.1
+django-storages==1.7.2
 django-waffle==0.17.0     # via edx-django-utils, edx-drf-extensions
-django==1.11.23
+django==1.11.25
 djangorestframework-jwt==1.11.0  # via edx-drf-extensions
-djangorestframework==3.7.7
+djangorestframework==3.9.4
 edx-django-oauth2-provider==1.3.5
-edx-django-utils==2.0.0   # via edx-drf-extensions
-edx-drf-extensions==2.4.0
-edx-lint==1.3.0
-edx-opaque-keys==1.0.1    # via edx-drf-extensions
+edx-django-utils==2.0.1   # via edx-drf-extensions
+edx-drf-extensions==2.4.2
+edx-lint==1.4.1
+edx-opaque-keys==2.0.0    # via edx-drf-extensions
 enum34==1.1.6
-fs==2.4.10
-future==0.17.1            # via pyjwkest
+fs==2.4.11
+funcsigs==1.0.2           # via mock
+future==0.18.1            # via backports.os, pyjwkest
+futures==3.3.0 ; python_version <= "3"
 idna==2.8                 # via requests
 isort==4.3.21
-lazy-object-proxy==1.4.1  # via astroid
+lazy-object-proxy==1.4.2  # via astroid
 lxml==4.4.1
 mccabe==0.6.1             # via pylint
 mock==3.0.5
-newrelic==5.0.2.126       # via edx-django-utils
+newrelic==5.2.1.129       # via edx-django-utils
 nose==1.3.7               # via django-nose
-packaging==19.1           # via caniusepython3
-pbr==5.4.2                # via stevedore
-pillow==6.1.0
+packaging==19.2           # via caniusepython3
+pbr==5.4.3                # via stevedore
+pillow==6.2.1
 psutil==1.2.1             # via edx-django-utils, edx-drf-extensions
 pycodestyle==2.5.0
-pycryptodomex==3.8.2      # via pyjwkest
-pydocstyle==4.0.1
+pycryptodomex==3.9.0      # via pyjwkest
+pydocstyle==3.0.0
 pyjwkest==1.3.2           # via edx-drf-extensions
 pyjwt==1.7.1              # via djangorestframework-jwt
 pylint-celery==0.3        # via edx-lint
-pylint-django==0.7.2      # via edx-lint
-pylint-plugin-utils==0.5  # via pylint-celery, pylint-django
-pylint==1.7.6             # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
+pylint-django==0.11.1     # via edx-lint
+pylint-plugin-utils==0.6  # via pylint-celery, pylint-django
+pylint==1.9.5             # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
 pymongo==3.9.0            # via edx-opaque-keys
 pyparsing==2.4.2          # via packaging
 pysrt==1.1.1
 python-dateutil==2.8.0    # via edx-drf-extensions
-pytz==2019.2              # via django, fs
+pytz==2019.3              # via django, fs
 requests==2.22.0          # via caniusepython3, edx-drf-extensions, pyjwkest
 rest-condition==1.0.3     # via edx-drf-extensions
-semantic-version==2.6.0   # via edx-drf-extensions
+semantic-version==2.8.2   # via edx-drf-extensions
 shortuuid==0.5.0          # via edx-django-oauth2-provider
-six==1.12.0               # via astroid, edx-drf-extensions, edx-lint, edx-opaque-keys, fs, mock, packaging, pyjwkest, pylint, python-dateutil, stevedore
-snowballstemmer==1.9.0    # via pydocstyle
-stevedore==1.30.1         # via edx-opaque-keys
-urllib3==1.25.3           # via requests
+singledispatch==3.4.0.3   # via astroid, pylint
+six==1.12.0               # via astroid, edx-drf-extensions, edx-lint, edx-opaque-keys, fs, mock, packaging, pydocstyle, pyjwkest, pylint, python-dateutil, singledispatch, stevedore
+snowballstemmer==2.0.0    # via pydocstyle
+stevedore==1.31.0         # via edx-opaque-keys
+typing==3.7.4.1           # via fs
+urllib3==1.25.6           # via requests
 wrapt==1.11.2             # via astroid
 
 # The following packages are considered to be unsafe in a requirements file:
-# setuptools==41.1.0        # via caniusepython3, fs
+# setuptools==41.4.0        # via caniusepython3, fs

requirements/test.txt

@@ -6,46 +6,49 @@
 #
 -e git+https://github.com/edx/django-rest-framework-oauth.git@0a43e8525f1e3048efe4bc70c03de308a277197c#egg=djangorestframework-oauth==1.1.1
 appdirs==1.4.3            # via fs
+backports.os==0.1.1       # via fs
 boto==2.49.0
-certifi==2019.6.16        # via requests
+certifi==2019.9.11        # via requests
 chardet==3.0.4            # via pysrt, requests
 coverage==4.5.4
 ddt==1.2.1
 django-model-utils==3.2.0
 django-nose==1.4.6
-django-storages==1.7.1
+django-storages==1.7.2
 django-waffle==0.17.0     # via edx-django-utils, edx-drf-extensions
 djangorestframework-jwt==1.11.0  # via edx-drf-extensions
-djangorestframework==3.7.7
+djangorestframework==3.9.4
 edx-django-oauth2-provider==1.3.5
-edx-django-utils==2.0.0   # via edx-drf-extensions
-edx-drf-extensions==2.4.0
-edx-opaque-keys==1.0.1    # via edx-drf-extensions
+edx-django-utils==2.0.1   # via edx-drf-extensions
+edx-drf-extensions==2.4.2
+edx-opaque-keys==2.0.0    # via edx-drf-extensions
 enum34==1.1.6
-fs==2.4.10
-future==0.17.1            # via pyjwkest
+fs==2.4.11
+funcsigs==1.0.2           # via mock
+future==0.18.1            # via backports.os, pyjwkest
 idna==2.8                 # via requests
 lxml==4.4.1
 mock==3.0.5
-newrelic==5.0.2.126       # via edx-django-utils
+newrelic==5.2.1.129       # via edx-django-utils
 nose==1.3.7               # via django-nose
-pbr==5.4.2                # via stevedore
-pillow==6.1.0
+pbr==5.4.3                # via stevedore
+pillow==6.2.1
 psutil==1.2.1             # via edx-django-utils, edx-drf-extensions
-pycryptodomex==3.8.2      # via pyjwkest
+pycryptodomex==3.9.0      # via pyjwkest
 pyjwkest==1.3.2           # via edx-drf-extensions
 pyjwt==1.7.1              # via djangorestframework-jwt
 pymongo==3.9.0            # via edx-opaque-keys
 pysrt==1.1.1
 python-dateutil==2.8.0    # via edx-drf-extensions
-pytz==2019.2              # via django, fs
+pytz==2019.3              # via django, fs
 requests==2.22.0          # via edx-drf-extensions, pyjwkest
 rest-condition==1.0.3     # via edx-drf-extensions
-semantic-version==2.6.0   # via edx-drf-extensions
+semantic-version==2.8.2   # via edx-drf-extensions
 shortuuid==0.5.0          # via edx-django-oauth2-provider
 six==1.12.0               # via edx-drf-extensions, edx-opaque-keys, fs, mock, pyjwkest, python-dateutil, stevedore
-stevedore==1.30.1         # via edx-opaque-keys
-urllib3==1.25.3           # via requests
+stevedore==1.31.0         # via edx-opaque-keys
+typing==3.7.4.1           # via fs
+urllib3==1.25.6           # via requests
 
 # The following packages are considered to be unsafe in a requirements file:
-# setuptools==41.1.0        # via fs
+# setuptools==41.4.0        # via fs

requirements/travis.txt

@@ -4,24 +4,34 @@
 #
 #    make upgrade
 #
-attrs==19.1.0             # via packaging
-certifi==2019.6.16        # via requests
+certifi==2019.9.11        # via requests, urllib3
+cffi==1.13.1              # via cryptography
 chardet==3.0.4            # via requests
+configparser==4.0.2       # via importlib-metadata
+contextlib2==0.6.0.post1  # via importlib-metadata
 coverage==4.5.4           # via coveralls
 coveralls==1.8.2
+cryptography==2.8         # via pyopenssl, urllib3
 docopt==0.6.2             # via coveralls
+enum34==1.1.6             # via cryptography
 filelock==3.0.12          # via tox
-idna==2.8                 # via requests
-importlib-metadata==0.19  # via pluggy, tox
-packaging==19.1           # via tox
-pluggy==0.12.0            # via tox
+idna==2.8                 # via requests, urllib3
+importlib-metadata==0.23  # via pluggy, tox
+ipaddress==1.0.23         # via cryptography, urllib3
+more-itertools==5.0.0     # via zipp
+packaging==19.2           # via tox
+pathlib2==2.3.5           # via importlib-metadata
+pluggy==0.13.0            # via tox
 py==1.8.0                 # via tox
+pycparser==2.19           # via cffi
+pyopenssl==19.0.0         # via urllib3
 pyparsing==2.4.2          # via packaging
 requests==2.22.0          # via coveralls
-six==1.12.0               # via packaging, tox
+scandir==1.10.0           # via pathlib2
+six==1.12.0               # via cryptography, more-itertools, packaging, pathlib2, pyopenssl, tox
 toml==0.10.0              # via tox
 tox-battery==0.5.1
-tox==3.13.2
-urllib3==1.25.3           # via requests
-virtualenv==16.7.3        # via tox
-zipp==0.5.2               # via importlib-metadata
+tox==3.14.0
+urllib3[secure]==1.25.6   # via coveralls, requests
+virtualenv==16.7.7        # via tox
+zipp==0.6.0               # via importlib-metadata

setup.py

@@ -44,7 +44,7 @@ def load_requirements(*requirements_paths):
     return list(requirements)
 
 
-VERSION = '1.1.28'
+VERSION = '1.1.29'
 
 if sys.argv[-1] == 'tag':
     print("Tagging the version on github:")