From 4c48e0e558a5b7b2670dd4194e25e6a0d2360e8b Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Fri, 24 Jan 2020 13:33:18 -0500
Subject: [PATCH] Unpin edx-rest-api-client and make upgrade.

---
 requirements/constraints.txt     |  4 ----
 requirements/edx/base.txt        | 12 ++++++------
 requirements/edx/development.txt | 12 ++++++------
 requirements/edx/testing.txt     | 12 ++++++------
 4 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index 2f5e90a52c..06c57a6a0b 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -70,7 +70,3 @@ freezegun==0.3.12
 
 # zipp 2.0.0 requires Python >= 3.6
 zipp==1.0.0
-
-# the latest release seems be backwards incompatible and is causing issues
-# error reported in: https://openedx.atlassian.net/browse/PROD-1195
-edx-rest-api-client<2.0.0
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 9641f8f0db..38dabf57f7 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -81,7 +81,7 @@ django-require==1.0.11
 django-sekizai==1.1.0
 django-ses==0.8.14
 django-simple-history==2.8.0
-django-splash==0.2.5
+django-splash==0.2.6
 django-statici18n==1.9.0
 django-storages==1.8
 django-user-tasks==0.3.0
@@ -107,7 +107,7 @@ edx-django-release-util==0.3.5
 edx-django-sites-extensions==2.4.3
 edx-django-utils==2.0.3
 edx-drf-extensions==2.4.5
-edx-enterprise==2.1.2
+edx-enterprise==2.1.4
 edx-i18n-tools==0.5.0
 edx-milestones==0.2.6
 edx-oauth2-provider==1.3.1
@@ -116,7 +116,7 @@ edx-organizations==2.2.0
 edx-proctoring-proctortrack==1.0.5
 edx-proctoring==2.2.4
 edx-rbac==1.0.5           # via edx-enterprise
-edx-rest-api-client==1.9.2
+edx-rest-api-client==3.0.2
 edx-search==1.2.2
 edx-sga==0.10.0
 edx-submissions==3.0.3
@@ -135,7 +135,7 @@ glob2==0.7
 gunicorn==20.0.4
 help-tokens==1.0.5
 html5lib==1.0.1
-httplib2==0.16.0
+httplib2==0.17.0
 idna==2.8
 importlib-metadata==1.4.0
 inflection==0.3.1         # via drf-yasg
@@ -173,13 +173,13 @@ numpy==1.18.1             # via scipy
 git+https://github.com/joestump/python-oauth2.git@b94f69b1ad195513547924e380d9265133e995fa#egg=oauth2
 oauthlib==2.1.0
 git+https://github.com/edx/edx-ora2.git@2.6.0#egg=ora2==2.6.0
-packaging==20.0           # via drf-yasg
+packaging==20.1           # via drf-yasg
 path.py==12.4.0           # via edx-enterprise, edx-i18n-tools
 path==13.1.0
 pathtools==0.1.2
 paver==1.3.4
 pbr==5.4.4
-pdfminer.six==20200121
+pdfminer.six==20200124
 piexif==1.1.3
 pillow==7.0.0
 pkgconfig==1.5.1          # via xmlsec
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 3dc91e3174..9269005180 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -92,7 +92,7 @@ django-require==1.0.11
 django-sekizai==1.1.0
 django-ses==0.8.14
 django-simple-history==2.8.0
-django-splash==0.2.5
+django-splash==0.2.6
 django-statici18n==1.9.0
 django-storages==1.8
 django-user-tasks==0.3.0
@@ -118,7 +118,7 @@ edx-django-release-util==0.3.5
 edx-django-sites-extensions==2.4.3
 edx-django-utils==2.0.3
 edx-drf-extensions==2.4.5
-edx-enterprise==2.1.2
+edx-enterprise==2.1.4
 edx-i18n-tools==0.5.0
 edx-lint==1.3.0
 edx-milestones==0.2.6
@@ -128,7 +128,7 @@ edx-organizations==2.2.0
 edx-proctoring-proctortrack==1.0.5
 edx-proctoring==2.2.4
 edx-rbac==1.0.5
-edx-rest-api-client==1.9.2
+edx-rest-api-client==3.0.2
 edx-search==1.2.2
 edx-sga==0.10.0
 edx-sphinx-theme==1.5.0
@@ -156,7 +156,7 @@ glob2==0.7
 gunicorn==20.0.4
 help-tokens==1.0.5
 html5lib==1.0.1
-httplib2==0.16.0
+httplib2==0.17.0
 httpretty==0.9.7
 idna==2.8
 imagesize==1.2.0          # via sphinx
@@ -205,7 +205,7 @@ numpy==1.18.1
 git+https://github.com/joestump/python-oauth2.git@b94f69b1ad195513547924e380d9265133e995fa#egg=oauth2
 oauthlib==2.1.0
 git+https://github.com/edx/edx-ora2.git@2.6.0#egg=ora2==2.6.0
-packaging==20.0
+packaging==20.1
 pandas==0.22.0
 path.py==12.4.0
 path==13.1.0
@@ -213,7 +213,7 @@ pathlib2==2.3.5
 pathtools==0.1.2
 paver==1.3.4
 pbr==5.4.4
-pdfminer.six==20200121
+pdfminer.six==20200124
 piexif==1.1.3
 pillow==7.0.0
 pip-tools==4.4.0
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 7c707de1a7..af7d482a1e 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -89,7 +89,7 @@ django-require==1.0.11
 django-sekizai==1.1.0
 django-ses==0.8.14
 django-simple-history==2.8.0
-django-splash==0.2.5
+django-splash==0.2.6
 django-statici18n==1.9.0
 django-storages==1.8
 django-user-tasks==0.3.0
@@ -114,7 +114,7 @@ edx-django-release-util==0.3.5
 edx-django-sites-extensions==2.4.3
 edx-django-utils==2.0.3
 edx-drf-extensions==2.4.5
-edx-enterprise==2.1.2
+edx-enterprise==2.1.4
 edx-i18n-tools==0.5.0
 edx-lint==1.3.0
 edx-milestones==0.2.6
@@ -124,7 +124,7 @@ edx-organizations==2.2.0
 edx-proctoring-proctortrack==1.0.5
 edx-proctoring==2.2.4
 edx-rbac==1.0.5
-edx-rest-api-client==1.9.2
+edx-rest-api-client==3.0.2
 edx-search==1.2.2
 edx-sga==0.10.0
 edx-submissions==3.0.3
@@ -151,7 +151,7 @@ glob2==0.7
 gunicorn==20.0.4
 help-tokens==1.0.5
 html5lib==1.0.1
-httplib2==0.16.0
+httplib2==0.17.0
 httpretty==0.9.7
 idna==2.8
 importlib-metadata==1.4.0
@@ -196,7 +196,7 @@ numpy==1.18.1
 git+https://github.com/joestump/python-oauth2.git@b94f69b1ad195513547924e380d9265133e995fa#egg=oauth2
 oauthlib==2.1.0
 git+https://github.com/edx/edx-ora2.git@2.6.0#egg=ora2==2.6.0
-packaging==20.0
+packaging==20.1
 pandas==0.22.0
 path.py==12.4.0
 path==13.1.0
@@ -204,7 +204,7 @@ pathlib2==2.3.5           # via pytest
 pathtools==0.1.2
 paver==1.3.4
 pbr==5.4.4
-pdfminer.six==20200121
+pdfminer.six==20200124
 piexif==1.1.3
 pillow==7.0.0
 pkgconfig==1.5.1