Skip to content

Bump edx-organizations version to 0.4.0 #11559

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
rlucioni merged 1 commit into from
Feb 22, 2016
Merged

Bump edx-organizations version to 0.4.0 #11559

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
3 changes: 2 additions & 1 deletion requirements/edx/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,11 @@ 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
djangorestframework-oauth==1.1.0
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-organizations==0.4.0
edx-rest-api-client==1.2.1
edx-search==0.1.2
facebook-sdk==0.4.0
Expand Down
1 change: 0 additions & 1 deletion requirements/edx/github.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
-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
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

@clintonb clintonb Feb 17, 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 will need to be properly uninstalled. See #11432 and #11513.

@rlucioni rlucioni Feb 17, 2016

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Thanks for the tip. Does this uninstall need to happen if the egg name is unchanged (i.e., if we decide to go back to using the unforked djangorestframework-oauth)? It looks like it might, since the package was previously installed as editable.

Also, it looks like this uninstall caused problems when creating new Jenkins workers. Do you know if those issues were resolved?

@clintonb clintonb Feb 17, 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 absolutely needs to happen; otherwise, the PyPI version will not be used. The worker issues were caused by the fact that I failed to update the expected version and python_uninstall_version.txt. If you do both together, there should be no issues.

@rlucioni rlucioni Feb 18, 2016

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@clintonb updated. The editable package should now be properly uninstalled.

@nedbat nedbat Feb 19, 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.

My understanding is that the other PR needed the uninstall step because the name of the kit was changing (to add the "edx-" prefix). In this case, the name of the kit is not changing, so the uninstall should not be needed.

@rlucioni rlucioni Feb 22, 2016

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Looks like you're right @nedbat. I experimented locally with a virtualenv by installing djangorestframework-oauth 1.0.1 as editable, then performing a regular install of djangorestframework-oauth 1.1.0. pip uninstalls the editable 1.0.1 before installing 1.1.0. I'll remove the explicit uninstall.

git+https://github.com/edx/nltk.git@2.0.6#egg=nltk==2.0.6
-e git+https://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev
Expand Down