From f4125e348b7ed03db0948d008aac8e08cdb07d75 Mon Sep 17 00:00:00 2001 From: Robert Raposa Date: Mon, 15 Oct 2018 13:56:41 -0400 Subject: [PATCH] Update edx-drf-extensions to 2.0.0. Note: This is not a backward-compatible change because it now relies on 2.0.0. ARCH-255 --- AUTHORS | 1 + CHANGELOG.rst | 5 +++++ completion/__init__.py | 2 +- completion/api/v1/views.py | 3 ++- requirements/base.in | 2 +- 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/AUTHORS b/AUTHORS index 4b02209..e53efb9 100644 --- a/AUTHORS +++ b/AUTHORS @@ -9,3 +9,4 @@ Nimisha Asthagiri Usman Khalid Rabia Iftikhar Ahsan Ulhaq +Robert Raposa diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 57886f9..2719eac 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -14,6 +14,11 @@ Change Log Unreleased ~~~~~~~~~~ +[1.0.0] - 2018-10-16 +-------------------- +* Updated edx-drf-extensions imports. Completion will no longer work with + outdated versions of edx-drf-extensions. + [0.1.14] - 2018-10-04 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * Added submit_completion and submit_group_completion methods on diff --git a/completion/__init__.py b/completion/__init__.py index ad3b2bc..fba0011 100644 --- a/completion/__init__.py +++ b/completion/__init__.py @@ -5,6 +5,6 @@ from __future__ import unicode_literals -__version__ = '0.1.14' +__version__ = '1.0.0' default_app_config = 'completion.apps.CompletionAppConfig' # pylint: disable=invalid-name diff --git a/completion/api/v1/views.py b/completion/api/v1/views.py index ff0f750..639cb08 100644 --- a/completion/api/v1/views.py +++ b/completion/api/v1/views.py @@ -14,7 +14,8 @@ from rest_framework import permissions from rest_framework import status -from edx_rest_framework_extensions.authentication import JwtAuthentication, SessionAuthenticationAllowInactiveUser +from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication +from edx_rest_framework_extensions.auth.session.authentication import SessionAuthenticationAllowInactiveUser from opaque_keys.edx.keys import CourseKey, UsageKey from opaque_keys import InvalidKeyError from six import text_type diff --git a/requirements/base.in b/requirements/base.in index 7633cdb..d01557e 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -4,6 +4,6 @@ Django>=1.8,<2.0 # Web application framework django-model-utils # Provides TimeStampedModel abstract base class djangorestframework>=3.2.0,<3.7.0 # REST API framework edx-opaque-keys[django] # Create and introspect course and xblock identities -edx-drf-extensions>=1.6.1,<2.0.0 # Provides JWT authentication +edx-drf-extensions>=2.0.0,<3.0.0 # Provides JWT authentication pytz # Time zone support XBlock # Courseware component architecture