Skip to content

Updated django-oauth2-provider #11432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clintonb merged 1 commit into from
Feb 10, 2016
Merged

Updated django-oauth2-provider #11432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions pavelib/prereqs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,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

@nedbat nedbat Feb 10, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This won't run unless you also update expected_version on line 186. Are you sure you need to perform an explicit uninstall?

@feanil feanil Feb 10, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nedbat it turns out he does, because the egg names are different. django-oauth2-provider vs edx-django-oauth2-provider

@nedbat nedbat Feb 10, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, sorry, I missed the egg-name change.

@nedbat nedbat Feb 10, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to change the expected_version to get this uninstall to run.

if not uninstalled:
break
else:
Expand Down
2 changes: 2 additions & 0 deletions requirements/edx/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions requirements/edx/github.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
# Third-party:
-e git+https://github.com/cyberdelia/django-pipeline.git@1.5.3#egg=django-pipeline
git+https://github.com/edx/django-wiki.git@v0.0.5#egg=django-wiki==0.0.5
-e git+https://github.com/edx/django-oauth2-provider.git@0.2.7-fork-edx-6a#egg=django-oauth2-provider==0.2.7-fork-edx-6
git+https://github.com/edx/django-openid-auth.git@0.8#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
Expand Down Expand Up @@ -82,7 +81,6 @@ git+https://github.com/edx/XBlock.git@xblock-0.4.4#egg=XBlock==0.4.4
-e git+https://github.com/edx/edx-submissions.git@0.1.3#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/i18n-tools.git@v0.2#egg=i18n-tools==v0.2
git+https://github.com/edx/edx-oauth2-provider.git@0.5.8#egg=edx-oauth2-provider==0.5.8
git+https://github.com/edx/edx-val.git@0.0.9#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
Expand Down