Merge pull request #11432 from edx/clintonb/oauth-client-credentials

Updated django-oauth2-provider
openedx · Feb 10, 2016 · 219b7f7 · 219b7f7
2 parents 5d0ed33 + e92802b
commit 219b7f7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/pavelib/prereqs.py b/pavelib/prereqs.py
@@ -194,6 +194,11 @@ def uninstall_python_packages():
             sh("pip uninstall --disable-pip-version-check -y django-storages")
             uninstalled = True
 
+        # Uninstall django-oauth2-provider
+        if any("django-oauth2-provider==" in line for line in frozen):
+            sh("pip uninstall --disable-pip-version-check -y django-oauth2-provider")
+            uninstalled = True
+
         if not uninstalled:
             break
     else:

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
@@ -34,6 +34,8 @@ django-method-override==0.1.0
 git+https://github.com/edx/django-rest-framework.git@3c72cb5ee5baebc4328947371195eae2077197b0#egg=djangorestframework==3.2.3
 django==1.8.9
 djangorestframework-jwt==1.7.2
+edx-django-oauth2-provider==0.5.0
+edx-oauth2-provider==0.5.9
 edx-opaque-keys==0.2.1
 edx-organizations==0.3.1
 edx-rest-api-client==1.2.1

diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt
@@ -46,7 +46,6 @@
 # Third-party:
 -e git+https://github.com/cyberdelia/[email protected]#egg=django-pipeline
 git+https://github.com/edx/[email protected]#egg=django-wiki==0.0.5
--e git+https://github.com/edx/[email protected]#egg=django-oauth2-provider==0.2.7-fork-edx-6
 git+https://github.com/edx/[email protected]#egg=django-openid-auth==0.8
 -e git+https://github.com/edx/django-rest-framework-oauth.git@f0b503fda8c254a38f97fef802ded4f5fe367f7a#egg=djangorestframework-oauth==1.0.1
 git+https://github.com/edx/MongoDBProxy.git@25b99097615bda06bd7cdfe5669ed80dc2a7fed0#egg=MongoDBProxy==0.1.0
@@ -82,7 +81,6 @@ git+https://github.com/edx/[email protected]#egg=XBlock==0.4.4
 -e git+https://github.com/edx/[email protected]#egg=edx-submissions==0.1.3
 git+https://github.com/edx/ease.git@release-2015-07-14#egg=ease==0.1.3
 git+https://github.com/edx/[email protected]#egg=i18n-tools==v0.2
-git+https://github.com/edx/[email protected]#egg=edx-oauth2-provider==0.5.8
 git+https://github.com/edx/[email protected]#egg=edxval==0.0.9
 -e git+https://github.com/pmitros/RecommenderXBlock.git@518234bc354edbfc2651b9e534ddb54f96080779#egg=recommender-xblock
 -e git+https://github.com/pmitros/RateXBlock.git@367e19c0f6eac8a5f002fd0f1559555f8e74bfff#egg=rate-xblock