From c2f3576475cafc5326487885698af209c5dab3bb Mon Sep 17 00:00:00 2001
From: Chris Pappas <christopappas@users.noreply.github.com>
Date: Tue, 21 May 2019 09:53:16 -0400
Subject: [PATCH] ENT-1914 | Running make upgrade to bump version of
 edx-enterprise (#20652)

This also pins scipy to version <=1.2.1 in constraints.txt, as 1.3.0 requires py3.5 or above
---
 requirements/constraints.txt     | 3 +++
 requirements/edx/base.txt        | 6 +++---
 requirements/edx/development.txt | 4 ++--
 requirements/edx/testing.txt     | 4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index 8338fbe8bc..e6af8f52ba 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -45,3 +45,6 @@ tornado<6.0
 
 # python3-saml 1.6.0 breaks unittests in common/djangoapps/third_party_auth/tests/test_views.py::SAMLMetadataTest
 python3-saml==1.5.0
+
+# version 1.3.0 breaks make upgrade, as it requires py3.5 or above
+scipy<=1.2.1
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index a9e3cfb277..6108f2f8c5 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -112,14 +112,14 @@ edx-django-release-util==0.3.1
 edx-django-sites-extensions==2.3.1
 edx-django-utils==1.0.3
 edx-drf-extensions==2.2.1
-edx-enterprise==1.5.3
+edx-enterprise==1.5.4
 edx-i18n-tools==0.4.8
 edx-milestones==0.1.13
 edx-oauth2-provider==1.2.2
 edx-opaque-keys[django]==0.4.4
 edx-organizations==2.0.2
 edx-proctoring-proctortrack==1.0.5
-edx-proctoring==2.0.1
+edx-proctoring==2.0.3
 edx-rbac==0.2.1           # via edx-enterprise
 edx-rest-api-client==1.9.2
 edx-search==1.2.2
@@ -169,7 +169,7 @@ networkx==1.7
 newrelic==4.18.0.118
 nltk==3.4.1
 nodeenv==1.1.1
-numpy==1.16.3             # via scipy
+numpy==1.16.3
 oauth2==1.9.0.post1
 oauthlib==2.1.0
 openapi-codec==1.3.2      # via django-rest-swagger
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 41cd74a318..9c644cb8a7 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -133,7 +133,7 @@ edx-django-release-util==0.3.1
 edx-django-sites-extensions==2.3.1
 edx-django-utils==1.0.3
 edx-drf-extensions==2.2.1
-edx-enterprise==1.5.3
+edx-enterprise==1.5.4
 edx-i18n-tools==0.4.8
 edx-lint==1.2.0
 edx-milestones==0.1.13
@@ -141,7 +141,7 @@ edx-oauth2-provider==1.2.2
 edx-opaque-keys[django]==0.4.4
 edx-organizations==2.0.2
 edx-proctoring-proctortrack==1.0.5
-edx-proctoring==2.0.1
+edx-proctoring==2.0.3
 edx-rbac==0.2.1
 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 4cea3f76c7..ced36421cd 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -129,7 +129,7 @@ edx-django-release-util==0.3.1
 edx-django-sites-extensions==2.3.1
 edx-django-utils==1.0.3
 edx-drf-extensions==2.2.1
-edx-enterprise==1.5.3
+edx-enterprise==1.5.4
 edx-i18n-tools==0.4.8
 edx-lint==1.2.0
 edx-milestones==0.1.13
@@ -137,7 +137,7 @@ edx-oauth2-provider==1.2.2
 edx-opaque-keys[django]==0.4.4
 edx-organizations==2.0.2
 edx-proctoring-proctortrack==1.0.5
-edx-proctoring==2.0.1
+edx-proctoring==2.0.3
 edx-rbac==0.2.1
 edx-rest-api-client==1.9.2
 edx-search==1.2.2