Skip to content

[Feature] Bitbucket Addon [OSF-8192]#7409

Merged
sloria merged 3 commits intoCenterForOpenScience:release/next-djangolefrom
mfraezz:feature/bitbucket-django
Jul 10, 2017
Merged

[Feature] Bitbucket Addon [OSF-8192]#7409
sloria merged 3 commits intoCenterForOpenScience:release/next-djangolefrom
mfraezz:feature/bitbucket-django

Conversation

@mfraezz
Copy link
Member

@mfraezz mfraezz commented Jun 29, 2017

Updates #6954

Purpose

Add support for a read-only bitbucket OSF add-on. Still targets develop-backup and needs to be upgraded to work with DjangOSF.

Changes

Adds a whole new provider in website/addons/bitbucket. All changes outside that directory go directly towards supporting the new addon.

Side effects

Unavoidable grief.

Ticket

[#SVCS-268] - JIRA
[#OSF-8192] - JIRA

Entangled with WB PR: CenterForOpenScience/waterbutler#198

MIGRATION WARNING

Not only does this share a migration number (0042) with #7418 , that migration has a conflicting action -- altering possible types for BaseFileNode.

Running makemigrations --merge will NOT be sufficient.

Instead, whichever PR goes in last will need the migration recreated before being merged.

if changed:

# # Delete existing hook, if any
# node_settings.delete_hook()
Copy link
Member Author

Choose a reason for hiding this comment

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

Note: Bitbucket does support webhooks, but Services/Product teams opted to skip them in the short term to release this faster. Comments left to simplify adding in future

@mfraezz mfraezz force-pushed the feature/bitbucket-django branch 2 times, most recently from 19f0592 to 90023fb Compare July 3, 2017 15:13
felliott added a commit to CenterForOpenScience/waterbutler that referenced this pull request Jul 3, 2017
 * Add readonly support for Bitbucket to WaterButler.  At the time
   this was being developed, Bitbucket did not have a write API, but
   that has since changed[1].  Write support will be added in a future
   ticket. This addon will not be useable until the corresponding OSF
   PR (CenterForOpenScience/osf.io#7409) is merged.

   Tickets: [SVCS-238][SVCS-266][SVCS-268][SVCS-376]
   Closes: #198

   [1] https://bitbucket.org/site/master/issues/8672/is-there-any-api-to-make-a-commit-bb-9954
@felliott
Copy link
Member

felliott commented Jul 3, 2017

The corresponding WB PR has been merged and pushed to WB's develop branch.

@mfraezz mfraezz changed the title [WIP] Bitbucket Addon [OSF-8192] [Feature] Bitbucket Addon [OSF-8192] Jul 3, 2017
@mfraezz mfraezz mentioned this pull request Jul 3, 2017
@mfraezz mfraezz force-pushed the feature/bitbucket-django branch 2 times, most recently from f2936d9 to 7138348 Compare July 6, 2017 18:01
@mfraezz mfraezz requested a review from sloria July 7, 2017 15:13
@mfraezz mfraezz force-pushed the feature/bitbucket-django branch from 7138348 to 6e8ed33 Compare July 7, 2017 15:20
@sloria sloria changed the base branch from develop to release/next-djangole July 7, 2017 20:27
@sloria sloria changed the base branch from release/next-djangole to develop July 7, 2017 20:30
@sloria sloria changed the base branch from develop to release/next-djangole July 7, 2017 20:30
Copy link
Contributor

@sloria sloria left a comment

Choose a reason for hiding this comment

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

No blockers except for the git history looks a bit messed up after I changed the base to release/next-djangole. @mfraezz Can you do some finagling so that only the three relevant commits are part of this PR?


bitbucket_repo: {
view: function(ctrl, logObject) {
var bitbucket_user = logObject.attributes.params.bitbucket_user;
Copy link
Contributor

Choose a reason for hiding this comment

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

Minor: as per the style guidelines, use lowerCameCase for variable names.

I'm aware that the github code is inconsistent--that can be changed another day...

@mfraezz mfraezz force-pushed the feature/bitbucket-django branch from 6e8ed33 to 2d7794f Compare July 8, 2017 18:08
@mfraezz mfraezz force-pushed the feature/bitbucket-django branch from 2d7794f to f521b9a Compare July 8, 2017 18:14
@mfraezz
Copy link
Member Author

mfraezz commented Jul 8, 2017

@sloria , finagling complete.

@sloria sloria merged commit 54a2bf8 into CenterForOpenScience:release/next-djangole Jul 10, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants