Merge pull request #34 from edx/robrap/ARCH-255-update-legacy-imports

ARCH-255: Update edx-drf-extensions imports.
openedx · Oct 16, 2018 · 5758c13 · 5758c13
2 parents 7f8ee3d + f4125e3
commit 5758c13
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -9,3 +9,4 @@ Nimisha Asthagiri <[email protected]>
 Usman Khalid <[email protected]>
 Rabia Iftikhar <[email protected]>
 Ahsan Ulhaq <[email protected]>
+Robert Raposa <[email protected]>
diff --git 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
@@ -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
@@ -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
@@ -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