From fbc59231fcb67c4a4b9c8f1a4b17be78aad8cd59 Mon Sep 17 00:00:00 2001
From: Robert Raposa <rraposa@edx.org>
Date: Fri, 12 Oct 2018 15:05:34 -0400
Subject: [PATCH] Update edx-drf-extensions to 2.0.0.

Note: this version update is backward incompatible.

ARCH-255
---
 cms/djangoapps/api/v1/views/course_runs.py                | 2 +-
 common/djangoapps/enrollment/views.py                     | 3 ++-
 common/djangoapps/entitlements/api/v1/views.py            | 2 +-
 common/djangoapps/third_party_auth/api/views.py           | 2 +-
 lms/djangoapps/badges/api/views.py                        | 2 +-
 lms/djangoapps/bulk_enroll/views.py                       | 2 +-
 lms/djangoapps/ccx/api/v0/views.py                        | 3 ++-
 lms/djangoapps/certificates/apis/v0/views.py              | 3 ++-
 lms/djangoapps/commerce/api/v1/views.py                   | 2 +-
 lms/djangoapps/course_goals/views.py                      | 2 +-
 lms/djangoapps/discussion_api/views.py                    | 2 +-
 lms/djangoapps/edxnotes/views.py                          | 2 +-
 lms/djangoapps/experiments/views.py                       | 3 ++-
 lms/djangoapps/grades/api/v1/views.py                     | 3 ++-
 lms/envs/common.py                                        | 2 +-
 openedx/core/djangoapps/api_admin/api/v1/views.py         | 2 +-
 openedx/core/djangoapps/credit/views.py                   | 2 +-
 openedx/core/djangoapps/oauth_dispatch/docs/README.rst    | 2 +-
 .../docs/decisions/0006-enforce-scopes-in-LMS-APIs.rst    | 3 ++-
 openedx/core/djangoapps/profile_images/views.py           | 2 +-
 openedx/core/djangoapps/user_api/accounts/views.py        | 3 ++-
 openedx/core/djangoapps/user_api/preferences/views.py     | 2 +-
 .../core/djangoapps/user_api/verification_api/views.py    | 2 +-
 openedx/core/djangoapps/user_api/views.py                 | 2 +-
 openedx/core/lib/api/view_utils.py                        | 3 ++-
 requirements/edx/base.in                                  | 2 +-
 requirements/edx/base.txt                                 | 8 ++++----
 requirements/edx/development.txt                          | 8 ++++----
 requirements/edx/testing.txt                              | 8 ++++----
 29 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/cms/djangoapps/api/v1/views/course_runs.py b/cms/djangoapps/api/v1/views/course_runs.py
index a7381e460e..a4ea693919 100644
--- a/cms/djangoapps/api/v1/views/course_runs.py
+++ b/cms/djangoapps/api/v1/views/course_runs.py
@@ -1,6 +1,6 @@
 from django.conf import settings
 from django.http import Http404
-from edx_rest_framework_extensions.authentication import JwtAuthentication
+from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
 from opaque_keys.edx.keys import CourseKey
 from rest_framework import parsers, permissions, status, viewsets
 from rest_framework.authentication import SessionAuthentication
diff --git a/common/djangoapps/enrollment/views.py b/common/djangoapps/enrollment/views.py
index e41203cdb4..246d8a0cd2 100644
--- a/common/djangoapps/enrollment/views.py
+++ b/common/djangoapps/enrollment/views.py
@@ -10,7 +10,8 @@ from django.db import transaction
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ObjectDoesNotExist
 from django.utils.decorators import method_decorator
-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 enrollment import api
 from enrollment.errors import CourseEnrollmentError, CourseEnrollmentExistsError, CourseModeNotFoundError
 from opaque_keys import InvalidKeyError
diff --git a/common/djangoapps/entitlements/api/v1/views.py b/common/djangoapps/entitlements/api/v1/views.py
index d55bae93b0..654df32a19 100644
--- a/common/djangoapps/entitlements/api/v1/views.py
+++ b/common/djangoapps/entitlements/api/v1/views.py
@@ -5,7 +5,7 @@ from django.db.models import Q
 from django.http import HttpResponseBadRequest
 from django.utils import timezone
 from django_filters.rest_framework import DjangoFilterBackend
-from edx_rest_framework_extensions.authentication import JwtAuthentication
+from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
 from edx_rest_framework_extensions.paginators import DefaultPagination
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey
diff --git a/common/djangoapps/third_party_auth/api/views.py b/common/djangoapps/third_party_auth/api/views.py
index b631d71204..fe590a46eb 100644
--- a/common/djangoapps/third_party_auth/api/views.py
+++ b/common/djangoapps/third_party_auth/api/views.py
@@ -4,7 +4,7 @@ Third Party Auth REST API views
 from django.contrib.auth.models import User
 from django.db.models import Q
 from django.http import Http404
-from edx_rest_framework_extensions.authentication import SessionAuthenticationAllowInactiveUser
+from edx_rest_framework_extensions.auth.session.authentication import SessionAuthenticationAllowInactiveUser
 from rest_framework import exceptions, status
 from rest_framework.generics import ListAPIView
 from rest_framework.response import Response
diff --git a/lms/djangoapps/badges/api/views.py b/lms/djangoapps/badges/api/views.py
index ece3167a52..5cec8b5826 100644
--- a/lms/djangoapps/badges/api/views.py
+++ b/lms/djangoapps/badges/api/views.py
@@ -1,7 +1,7 @@
 """
 API views for badges
 """
-from edx_rest_framework_extensions.authentication import SessionAuthenticationAllowInactiveUser
+from edx_rest_framework_extensions.auth.session.authentication import SessionAuthenticationAllowInactiveUser
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.django.models import CourseKeyField
 from opaque_keys.edx.keys import CourseKey
diff --git a/lms/djangoapps/bulk_enroll/views.py b/lms/djangoapps/bulk_enroll/views.py
index 2a2520cad8..57ccf4d0e6 100644
--- a/lms/djangoapps/bulk_enroll/views.py
+++ b/lms/djangoapps/bulk_enroll/views.py
@@ -2,7 +2,7 @@
 API views for Bulk Enrollment
 """
 import json
-from edx_rest_framework_extensions.authentication import JwtAuthentication
+from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
 from rest_framework import status
 from rest_framework.response import Response
 from rest_framework.views import APIView
diff --git a/lms/djangoapps/ccx/api/v0/views.py b/lms/djangoapps/ccx/api/v0/views.py
index de5e1d7dce..440d8ef971 100644
--- a/lms/djangoapps/ccx/api/v0/views.py
+++ b/lms/djangoapps/ccx/api/v0/views.py
@@ -9,7 +9,8 @@ from ccx_keys.locator import CCXLocator
 from django.contrib.auth.models import User
 from django.db import transaction
 from django.http import Http404
-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 import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey, UsageKey
 from rest_framework import status
diff --git a/lms/djangoapps/certificates/apis/v0/views.py b/lms/djangoapps/certificates/apis/v0/views.py
index 21874dda23..ea7c613d2d 100644
--- a/lms/djangoapps/certificates/apis/v0/views.py
+++ b/lms/djangoapps/certificates/apis/v0/views.py
@@ -5,7 +5,8 @@ from rest_framework.generics import GenericAPIView
 from rest_framework.response import Response
 
 from edx_rest_framework_extensions import permissions
-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 lms.djangoapps.certificates.api import get_certificate_for_user
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey
diff --git a/lms/djangoapps/commerce/api/v1/views.py b/lms/djangoapps/commerce/api/v1/views.py
index 0e19b2d590..384cbaeb2a 100644
--- a/lms/djangoapps/commerce/api/v1/views.py
+++ b/lms/djangoapps/commerce/api/v1/views.py
@@ -3,7 +3,7 @@ import logging
 from django.contrib.auth.models import User
 from django.http import Http404
 from edx_rest_api_client import exceptions
-from edx_rest_framework_extensions.authentication import JwtAuthentication
+from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
 from rest_framework.authentication import SessionAuthentication
 from rest_framework.generics import ListAPIView, RetrieveUpdateAPIView
 from rest_framework.permissions import IsAuthenticated
diff --git a/lms/djangoapps/course_goals/views.py b/lms/djangoapps/course_goals/views.py
index 199708e335..8a63470825 100644
--- a/lms/djangoapps/course_goals/views.py
+++ b/lms/djangoapps/course_goals/views.py
@@ -9,7 +9,7 @@ from django.conf import settings
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 from django.http import JsonResponse
-from edx_rest_framework_extensions.authentication import JwtAuthentication
+from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
 from eventtracking import tracker
 from opaque_keys.edx.keys import CourseKey
 from openedx.core.lib.api.permissions import IsStaffOrOwner
diff --git a/lms/djangoapps/discussion_api/views.py b/lms/djangoapps/discussion_api/views.py
index 96a912b7d0..bb7efee54d 100644
--- a/lms/djangoapps/discussion_api/views.py
+++ b/lms/djangoapps/discussion_api/views.py
@@ -3,7 +3,7 @@ Discussion API views
 """
 from django.core.exceptions import ValidationError
 from django.contrib.auth import get_user_model
-from edx_rest_framework_extensions.authentication import JwtAuthentication
+from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
 from opaque_keys.edx.keys import CourseKey
 from rest_framework import permissions
 from rest_framework import status
diff --git a/lms/djangoapps/edxnotes/views.py b/lms/djangoapps/edxnotes/views.py
index 1895fa7f58..f4f3d2201d 100644
--- a/lms/djangoapps/edxnotes/views.py
+++ b/lms/djangoapps/edxnotes/views.py
@@ -20,7 +20,7 @@ from rest_framework.views import APIView
 from courseware.courses import get_course_with_access
 from courseware.model_data import FieldDataCache
 from courseware.module_render import get_module_for_descriptor
-from edx_rest_framework_extensions.authentication import JwtAuthentication
+from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
 from edxmako.shortcuts import render_to_response
 from edxnotes.exceptions import EdxNotesParseError, EdxNotesServiceUnavailable
 from edxnotes.helpers import (
diff --git a/lms/djangoapps/experiments/views.py b/lms/djangoapps/experiments/views.py
index ccbc4f9797..aca1702ff7 100644
--- a/lms/djangoapps/experiments/views.py
+++ b/lms/djangoapps/experiments/views.py
@@ -1,7 +1,8 @@
 from django.contrib.auth import get_user_model
 from django.db import transaction
 from django_filters.rest_framework import DjangoFilterBackend
-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 rest_framework import permissions, viewsets
 from rest_framework.decorators import list_route
 from rest_framework.response import Response
diff --git a/lms/djangoapps/grades/api/v1/views.py b/lms/djangoapps/grades/api/v1/views.py
index becf4b7906..93649f384d 100644
--- a/lms/djangoapps/grades/api/v1/views.py
+++ b/lms/djangoapps/grades/api/v1/views.py
@@ -15,7 +15,8 @@ from six import text_type
 
 from courseware.courses import get_course_with_access
 from edx_rest_framework_extensions import permissions
-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 enrollment import data as enrollment_data
 from lms.djangoapps.grades.api.serializers import StudentGradebookEntrySerializer
 from lms.djangoapps.grades.config.waffle import waffle_flags, WRITABLE_GRADEBOOK
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 889228d95e..7df659fcb0 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -3167,7 +3167,7 @@ JWT_AUTH = {
 
     'JWT_PAYLOAD_GET_USERNAME_HANDLER': lambda d: d.get('username'),
     'JWT_LEEWAY': 1,
-    'JWT_DECODE_HANDLER': 'edx_rest_framework_extensions.utils.jwt_decode_handler',
+    'JWT_DECODE_HANDLER': 'edx_rest_framework_extensions.auth.jwt.decoder.jwt_decode_handler',
 
     # Number of seconds before JWTs expire
     'JWT_EXPIRATION': 30,
diff --git a/openedx/core/djangoapps/api_admin/api/v1/views.py b/openedx/core/djangoapps/api_admin/api/v1/views.py
index d7fc2f87fe..bf2a900117 100644
--- a/openedx/core/djangoapps/api_admin/api/v1/views.py
+++ b/openedx/core/djangoapps/api_admin/api/v1/views.py
@@ -3,7 +3,7 @@ API Views.
 """
 from django_filters.rest_framework import DjangoFilterBackend
 
-from edx_rest_framework_extensions.authentication import JwtAuthentication
+from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
 from rest_framework.authentication import SessionAuthentication
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.generics import ListAPIView
diff --git a/openedx/core/djangoapps/credit/views.py b/openedx/core/djangoapps/credit/views.py
index 06ab088fba..8ea058a4fb 100644
--- a/openedx/core/djangoapps/credit/views.py
+++ b/openedx/core/djangoapps/credit/views.py
@@ -10,7 +10,7 @@ import pytz
 from django.conf import settings
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
-from edx_rest_framework_extensions.authentication import JwtAuthentication
+from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey
 from rest_framework import generics, mixins, permissions, views, viewsets
diff --git a/openedx/core/djangoapps/oauth_dispatch/docs/README.rst b/openedx/core/djangoapps/oauth_dispatch/docs/README.rst
index 35927cb6cc..245bda3337 100644
--- a/openedx/core/djangoapps/oauth_dispatch/docs/README.rst
+++ b/openedx/core/djangoapps/oauth_dispatch/docs/README.rst
@@ -92,7 +92,7 @@ Authentication by REST endpoints
   user of its EdXOpenIdConnect_ class is the edx-analytics-dashboard_.
 
 .. _Django Rest Framework (DRF): https://github.com/encode/django-rest-framework
-.. _JwtAuthentication: https://github.com/edx/edx-drf-extensions/blob/1db9f5e3e5130a1e0f43af2035489b3ed916d245/edx_rest_framework_extensions/authentication.py#L153
+.. _JwtAuthentication: https://github.com/edx/edx-drf-extensions/blob/4569b9bf7e54a917d4acdd545b10c058c960dd1a/edx_rest_framework_extensions/auth/jwt/authentication.py#L17
 .. _authentication_classes: http://www.django-rest-framework.org/api-guide/authentication/#setting-the-authentication-scheme
 .. _edx-drf-extensions: https://github.com/edx/edx-drf-extensions
 .. _django-rest-framework-jwt: https://github.com/GetBlimp/django-rest-framework-jwt
diff --git a/openedx/core/djangoapps/oauth_dispatch/docs/decisions/0006-enforce-scopes-in-LMS-APIs.rst b/openedx/core/djangoapps/oauth_dispatch/docs/decisions/0006-enforce-scopes-in-LMS-APIs.rst
index 3135a05df5..e4b4fe5c8a 100644
--- a/openedx/core/djangoapps/oauth_dispatch/docs/decisions/0006-enforce-scopes-in-LMS-APIs.rst
+++ b/openedx/core/djangoapps/oauth_dispatch/docs/decisions/0006-enforce-scopes-in-LMS-APIs.rst
@@ -189,7 +189,8 @@ See 0007-include-organizations-in-tokens_ for decisions on this.
 .. _function-based Django views: https://docs.djangoproject.com/en/2.0/topics/http/views/
 .. _Django Rest Framework (DRF): http://www.django-rest-framework.org/
 .. _Python decorator: http://www.django-rest-framework.org/tutorial/2-requests-and-responses/#wrapping-api-views
-.. _JwtAuthentication: https://github.com/edx/edx-drf-extensions/blob/1db9f5e3e5130a1e0f43af2035489b3ed916d245/edx_rest_framework_extensions/authentication.py#L153
+.. _JwtAuthentication: https://github.com/edx/edx-drf-extensions/blob/4569b9bf7e54a917d4acdd545b10c058c960dd1a/edx_rest_framework_extensions/auth/jwt/authentication.py#L17
+
 
 Consequences
 ------------
diff --git a/openedx/core/djangoapps/profile_images/views.py b/openedx/core/djangoapps/profile_images/views.py
index 52a2ef66d2..0086b1eef6 100644
--- a/openedx/core/djangoapps/profile_images/views.py
+++ b/openedx/core/djangoapps/profile_images/views.py
@@ -8,7 +8,7 @@ from contextlib import closing
 
 from pytz import UTC
 from django.utils.translation import ugettext as _
-from edx_rest_framework_extensions.authentication import SessionAuthenticationAllowInactiveUser
+from edx_rest_framework_extensions.auth.session.authentication import SessionAuthenticationAllowInactiveUser
 from rest_framework import permissions, status
 from rest_framework.parsers import FormParser, MultiPartParser
 from rest_framework.response import Response
diff --git a/openedx/core/djangoapps/user_api/accounts/views.py b/openedx/core/djangoapps/user_api/accounts/views.py
index 4dd254363a..89916e72cf 100644
--- a/openedx/core/djangoapps/user_api/accounts/views.py
+++ b/openedx/core/djangoapps/user_api/accounts/views.py
@@ -17,7 +17,8 @@ from django.db import transaction
 from django.utils.translation import ugettext as _
 from edx_ace import ace
 from edx_ace.recipient import Recipient
-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 enterprise.models import EnterpriseCourseEnrollment, EnterpriseCustomerUser, PendingEnterpriseCustomerUser
 from integrated_channels.degreed.models import DegreedLearnerDataTransmissionAudit
 from integrated_channels.sap_success_factors.models import SapSuccessFactorsLearnerDataTransmissionAudit
diff --git a/openedx/core/djangoapps/user_api/preferences/views.py b/openedx/core/djangoapps/user_api/preferences/views.py
index 227b4fd776..dcfbcfa61e 100644
--- a/openedx/core/djangoapps/user_api/preferences/views.py
+++ b/openedx/core/djangoapps/user_api/preferences/views.py
@@ -11,7 +11,7 @@ from rest_framework import permissions
 
 from django.db import transaction
 from django.utils.translation import ugettext as _
-from edx_rest_framework_extensions.authentication import SessionAuthenticationAllowInactiveUser
+from edx_rest_framework_extensions.auth.session.authentication import SessionAuthenticationAllowInactiveUser
 
 from openedx.core.lib.api.authentication import OAuth2AuthenticationAllowInactiveUser
 from openedx.core.lib.api.parsers import MergePatchParser
diff --git a/openedx/core/djangoapps/user_api/verification_api/views.py b/openedx/core/djangoapps/user_api/verification_api/views.py
index b64714ba46..065d4a83ce 100644
--- a/openedx/core/djangoapps/user_api/verification_api/views.py
+++ b/openedx/core/djangoapps/user_api/verification_api/views.py
@@ -1,6 +1,6 @@
 """ Verification API v1 views. """
 from django.http import Http404
-from edx_rest_framework_extensions.authentication import JwtAuthentication
+from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
 from rest_framework.authentication import SessionAuthentication
 from rest_framework.generics import RetrieveAPIView
 from rest_framework_oauth.authentication import OAuth2Authentication
diff --git a/openedx/core/djangoapps/user_api/views.py b/openedx/core/djangoapps/user_api/views.py
index e5a175f59b..0e39591cf7 100644
--- a/openedx/core/djangoapps/user_api/views.py
+++ b/openedx/core/djangoapps/user_api/views.py
@@ -17,7 +17,7 @@ from six import text_type
 
 import accounts
 from django_comment_common.models import Role
-from edx_rest_framework_extensions.authentication import SessionAuthenticationAllowInactiveUser
+from edx_rest_framework_extensions.auth.session.authentication import SessionAuthenticationAllowInactiveUser
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx import locator
 from opaque_keys.edx.keys import CourseKey
diff --git a/openedx/core/lib/api/view_utils.py b/openedx/core/lib/api/view_utils.py
index ce227df0e3..ef67c4eb82 100644
--- a/openedx/core/lib/api/view_utils.py
+++ b/openedx/core/lib/api/view_utils.py
@@ -4,7 +4,8 @@ Utilities related to API views
 from django.core.exceptions import NON_FIELD_ERRORS, ObjectDoesNotExist, ValidationError
 from django.http import Http404
 from django.utils.translation import ugettext as _
-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 rest_framework import status
 from rest_framework.exceptions import APIException
 from rest_framework.generics import GenericAPIView
diff --git a/requirements/edx/base.in b/requirements/edx/base.in
index a2f397e64e..f1ca679312 100644
--- a/requirements/edx/base.in
+++ b/requirements/edx/base.in
@@ -32,7 +32,7 @@ boto3==1.4.8                        # Amazon Web Services SDK for Python
 botocore==1.8.17                    # via boto3, s3transfer
 celery==3.1.25                      # Asynchronous task execution library
 defusedxml==0.4.1                   # XML bomb protection for common XML parsers
-Django==1.11.15                     # Web application framework
+Django==1.11.16                     # Web application framework
 django-babel-underscore             # underscore template extractor for django-babel (internationalization utilities)
 django-config-models                # Configuration models for Django allowing config management with auditing
 django-cors-headers==2.1.0          # Used to allow to configure CORS headers for cross-domain requests
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index b1251d626a..01cbd99ef8 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -112,18 +112,18 @@ edx-ace==0.1.9
 edx-analytics-data-api-client==0.14.4
 edx-ccx-keys==0.2.1
 edx-celeryutils==0.2.7
-edx-completion==0.1.10
+edx-completion==1.0.0
 edx-django-oauth2-provider==1.3.5
 edx-django-release-util==0.3.1
 edx-django-sites-extensions==2.3.1
 edx-django-utils==1.0.1
-edx-drf-extensions==1.11.0
-edx-enterprise==0.73.6
+edx-drf-extensions==2.0.0
+edx-enterprise==1.0.0
 edx-i18n-tools==0.4.6
 edx-milestones==0.1.13
 edx-oauth2-provider==1.2.2
 edx-opaque-keys[django]==0.4.4
-edx-organizations==0.4.10
+edx-organizations==1.0.0
 edx-proctoring==1.4.0
 edx-rest-api-client==1.8.2
 edx-search==1.2.1
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 10bb010b55..629f1a35f0 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -131,19 +131,19 @@ edx-ace==0.1.9
 edx-analytics-data-api-client==0.14.4
 edx-ccx-keys==0.2.1
 edx-celeryutils==0.2.7
-edx-completion==0.1.10
+edx-completion==1.0.0
 edx-django-oauth2-provider==1.3.5
 edx-django-release-util==0.3.1
 edx-django-sites-extensions==2.3.1
 edx-django-utils==1.0.1
-edx-drf-extensions==1.11.0
-edx-enterprise==0.73.6
+edx-drf-extensions==2.0.0
+edx-enterprise==1.0.0
 edx-i18n-tools==0.4.6
 edx-lint==0.5.5
 edx-milestones==0.1.13
 edx-oauth2-provider==1.2.2
 edx-opaque-keys[django]==0.4.4
-edx-organizations==0.4.10
+edx-organizations==1.0.0
 edx-proctoring==1.4.0
 edx-rest-api-client==1.8.2
 edx-search==1.2.1
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 50c2dca7a0..bf01669aa7 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -126,19 +126,19 @@ edx-ace==0.1.9
 edx-analytics-data-api-client==0.14.4
 edx-ccx-keys==0.2.1
 edx-celeryutils==0.2.7
-edx-completion==0.1.10
+edx-completion==1.0.0
 edx-django-oauth2-provider==1.3.5
 edx-django-release-util==0.3.1
 edx-django-sites-extensions==2.3.1
 edx-django-utils==1.0.1
-edx-drf-extensions==1.11.0
-edx-enterprise==0.73.6
+edx-drf-extensions==2.0.0
+edx-enterprise==1.0.0
 edx-i18n-tools==0.4.6
 edx-lint==0.5.5
 edx-milestones==0.1.13
 edx-oauth2-provider==1.2.2
 edx-opaque-keys[django]==0.4.4
-edx-organizations==0.4.10
+edx-organizations==1.0.0
 edx-proctoring==1.4.0
 edx-rest-api-client==1.8.2
 edx-search==1.2.1