From d1f938ba444af94ca9cfa614c76de8b69c2c5ff4 Mon Sep 17 00:00:00 2001
From: Matt Hughes <mhughes@edx.org>
Date: Mon, 25 Mar 2019 16:53:32 -0400
Subject: [PATCH] fixing issue with instructor service not being loaded in
 studio

was causing issues with PT exam configuration dashboard launch
---
 requirements/constraints.txt     | 5 ++++-
 requirements/edx/base.txt        | 2 +-
 requirements/edx/development.txt | 2 +-
 requirements/edx/testing.txt     | 2 +-
 setup.py                         | 3 ++-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index b21f82763f..949787eb4e 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -43,4 +43,7 @@ oauthlib==2.1.0
 pytest-randomly<2.0.0
 
 # Tornado dropped support for Python 2.7 and 3.4 with version 6.0. Only Python 3.5.2+ is now supported
-tornado<6.0
\ No newline at end of file
+tornado<6.0
+
+# Preventing https://github.com/edx/edx-proctoring/pull/557 being installed before https://github.com/edx/edx-platform/pull/19959
+edx-proctoring==1.5.21
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 6321593c57..b92c30f3b8 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -120,7 +120,7 @@ edx-oauth2-provider==1.2.2
 edx-opaque-keys[django]==0.4.4
 edx-organizations==1.0.1
 edx-proctoring-proctortrack==1.0.4
-edx-proctoring==1.6.0
+edx-proctoring==1.5.21
 edx-rbac==0.1.5           # via edx-enterprise
 edx-rest-api-client==1.9.2
 edx-search==1.2.2
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 5c67631f32..f6dc9c80b9 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -143,7 +143,7 @@ edx-oauth2-provider==1.2.2
 edx-opaque-keys[django]==0.4.4
 edx-organizations==1.0.1
 edx-proctoring-proctortrack==1.0.4
-edx-proctoring==1.6.0
+edx-proctoring==1.5.21
 edx-rbac==0.1.5
 edx-rest-api-client==1.9.2
 edx-search==1.2.2
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 7a3cac8d5c..8b22de6e62 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -139,7 +139,7 @@ edx-oauth2-provider==1.2.2
 edx-opaque-keys[django]==0.4.4
 edx-organizations==1.0.1
 edx-proctoring-proctortrack==1.0.4
-edx-proctoring==1.6.0
+edx-proctoring==1.5.21
 edx-rbac==0.1.5
 edx-rest-api-client==1.9.2
 edx-search==1.2.2
diff --git a/setup.py b/setup.py
index ce1a384d37..26e0426552 100644
--- a/setup.py
+++ b/setup.py
@@ -98,7 +98,8 @@ setup(
             "bookmarks = openedx.core.djangoapps.bookmarks.apps:BookmarksConfig",
             "zendesk_proxy = openedx.core.djangoapps.zendesk_proxy.apps:ZendeskProxyConfig",
             "password_policy = openedx.core.djangoapps.password_policy.apps:PasswordPolicyConfig",
-            "user_authn = openedx.core.djangoapps.user_authn.apps:UserAuthnConfig"
+            "user_authn = openedx.core.djangoapps.user_authn.apps:UserAuthnConfig",
+            "instructor = lms.djangoapps.instructor.apps:InstructorConfig",
         ],
     }
 )