[MRG] add hydroshare as a repo provider #967

sblack-usu · 2019-09-28T01:43:56Z

repo2docker changes:
jupyterhub/repo2docker#800

nuest

LGTM, just wondering about the wording to be consistent with other DOI-based repos.

nuest · 2019-10-08T07:44:31Z

binderhub/templates/index.html

@@ -56,6 +56,7 @@ <h4 id="form-header" class='row'>Build and launch a repository</h4>
                <li class="dropdown-item" value="git"><a href="#">Git repository</a></li>
                <li class="dropdown-item" value="zenodo"><a href="#">Zenodo DOI</a></li>
                <li class="dropdown-item" value="figshare"><a href="#">Figshare DOI</a></li>
+                <li class="dropdown-item" value="hydroshare"><a href="#">Hydroshare resource</a></li>


I am unsure about the wording here, because for Zenodo and Fishare, we also support plain Zenodo URLs (they are just patched through), and it seems the Hydroshare support in repo2docker also supports DOIs...

@betatim What wording should BinderHub use here? Favour "DOI" or "resource" (or "record"). I'd tend towards only talking about DOIs externally, but not failing when direct resource URLs are provided.

I used resource because it is a HydroShare term. I'm fine highlighting the DOI, but I do think it'd be good to point to a resource id as well, because resources don't have a functional DOI until they publish the resource. Let me know what you'd like, and I can update it in this PR

I think if there's a provider-specific wording, we can just use that since a user familiar with it will be expecting that word (as long as it's not too long or complex)

binderhub/tests/test_repoproviders.py

sblack-usu · 2019-10-21T19:22:24Z

@nuest @betatim - Anything else you need from me to get this merged? The only thing I'm aware that is up for question here is what the HydroShare DOI/Resource box label should say. I'm happy to use what you'd like.

jhamman · 2019-12-02T04:46:56Z

pinging @betatim and @choldgraf. Anything left to do here before merging?

choldgraf · 2019-12-03T00:30:21Z

I can try to take a pass at this something this week. I'm a bit unsure of the details for hydroshare's API etc, so I'll have to take y'alls word on this. @nuest do you think this one is good to go?

choldgraf · 2019-12-04T21:02:55Z

This looks good to me - I'd like to get

#1017

merged, and then have this PR add some documentation about the HydroShare provider, before merging. Sounds good?

sblack-usu · 2019-12-04T21:27:43Z

I'll be happy to update documentation once that PR is merged. Just let me know when I can pull and I'll add a commit for HydroShare. It looks like entries will need to be added only for doc/developer/repoproviders.rst and doc/reference/repoproviders.rst

choldgraf · 2019-12-05T16:45:05Z

OK, we just got #1017 merged, so can you follow the instructions here:

https://binderhub.readthedocs.io/en/latest/developer/repoproviders.html#adding-a-new-repository-provider

In particular the bit about documenting this repoprovider, and then we can merge?

cc @sblack-usu

betatim · 2019-12-06T07:14:06Z

Anything left to do here before merging?

The repo2docker PR is still outstanding so that needs taking care of.

bitnik · 2019-12-06T11:43:43Z

I think this is not ready to merge. get_resolved_spec and get_resolved_ref_url methods are not defined and they are used during build process:

binderhub/binderhub/builder.py

Lines 258 to 259 in 089702b

    
           self.ref_url = await provider.get_resolved_ref_url() 
        
           resolved_spec = await provider.get_resolved_spec()

I think same applies for DataverseProvider PR.

sblack-usu · 2019-12-06T16:03:29Z

Those look like they were added 10 days ago, they were not part of the RepoProvider class when I submitted. I'll go ahead and see about implementing them along with adding the new documentation today.

sblack-usu · 2020-01-28T19:56:51Z

binderhub/repoproviders.py

+
+    async def get_resolved_ref_url(self):
+        # Hydroshare does not provide a history, resolves to repo url
+        return self.get_repo_url()


get_resolved_spec and get_resolved_ref_url were two methods that I've implemented since the original review. With what I gleaned from the documentation, resolving to get_repo_url() made sense for HydroShare. If this is incorrect, I'll need suggestions to guide a different implementation.

sblack-usu · 2020-01-28T19:58:44Z

I've resolved the merge conflicts. I'll be testing the newly merged code with a full deploy of this branch and the repo2docker changes tomorrow.

choldgraf · 2020-01-28T20:27:25Z

Great - let us know how it goes!

sblack-usu · 2020-01-31T19:25:25Z

Sorry about taking a little longer to get around to testing a full deploy of this. We got it deployed and tested today. It's ready to be merged along with the repo2docker changes.

choldgraf · 2020-02-03T17:54:52Z

ok these are both merged - I guess now we wait for this to make it into mybinder.org and see how hydroshare repos work?

"jupyterhub/binderhub#967"

sblack-usu · 2020-02-03T18:07:53Z

Sounds good @choldgraf and thanks for merging. I did a deploy and tested the hydroshare repo on google cloud on Friday, so I expect mybinder.org to work fine. Let me know when it's deployed and I can run some manual tests.

choldgraf · 2020-02-03T19:32:16Z

OK I just merged into mybinder.org, so give it a whirl after a few minutes when it is done deploying

jhamman · 2020-02-03T20:02:07Z

Thanks @sblack-usu for sticking with this one!

sblack-usu · 2020-02-03T20:31:34Z

I was able to build from a hydroshare resource, thanks for pushing this through.

choldgraf · 2020-02-03T20:32:58Z

hooray! 🎉🎉🎉🎉

add hydroshare as a repo provider

fb05c64

sblack-usu mentioned this pull request Sep 28, 2019

[MRG] add Hydroshare as a content provider jupyterhub/repo2docker#800

Merged

sblack-usu added 2 commits October 3, 2019 09:32

allow resource_id or resource url

5976f16

update hydroshare messaging for url or id

1d37ef2

nuest reviewed Oct 8, 2019

View reviewed changes

sblack-usu added 5 commits October 8, 2019 09:06

abstract out resource id parsing into own method

57661ee

add hydroshare doi test

e034264

update hydroshare repoprovider tests to account for version update

a561af9

update hydroshare repoprovider tests to account for version update

8867a95

pull in updated version fetch logic

44b5571

sblack-usu closed this Oct 16, 2019

sblack-usu reopened this Oct 16, 2019

sblack-usu added 2 commits October 16, 2019 15:13

add datetime and timezone import

f88396c

update hydroshare doi test to check correct repo_url

1954009

sblack-usu changed the title ~~[wip] add hydroshare as a repo provider~~ [MRG] add hydroshare as a repo provider Oct 16, 2019

choldgraf mentioned this pull request Dec 4, 2019

adding repoproviders documentation #1017

Merged

Merge branch 'master' into hydroshare-provider

9d38045

choldgraf mentioned this pull request Dec 6, 2019

Add Dataverse to UI. Fixes #900 #969

Merged

sblack-usu added 3 commits January 28, 2020 10:07

implement new RepoProvider methods and update new documentation

69bb809

Merge remote-tracking branch 'upstream/master' into hydroshare-provider

3bfee95

use await to test resolved ref and spec

7cfad48

sblack-usu commented Jan 28, 2020

View reviewed changes

choldgraf merged commit 0a0c0ca into jupyterhub:master Feb 3, 2020

yuvipanda pushed a commit to jupyterhub/helm-chart that referenced this pull request Feb 3, 2020

[binderhub] Automatic update for commit 0.2.0-n093.h7cfad48

9e8236b

"jupyterhub/binderhub#967"

henchbot mentioned this pull request Feb 3, 2020

Merge pull request #1333 from henchbot/binderhub_bump jupyterhub/mybinder.org-deploy#1333

Merged

henchbot mentioned this pull request Feb 4, 2020

binderhub: 0.2.0-n093.h7cfad48...0.2.0-n096.h4e521a1 jupyterhub/mybinder.org-deploy#1334

Merged

MaxMood96 mentioned this pull request Jul 11, 2023

[Snyk] Security upgrade babel-loader from 8.3.0 to 9.0.0 MaxMood96/binderhub#43

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[MRG] add hydroshare as a repo provider #967

[MRG] add hydroshare as a repo provider #967

sblack-usu commented Sep 28, 2019

nuest left a comment

nuest Oct 8, 2019

sblack-usu Oct 14, 2019

choldgraf Dec 4, 2019

sblack-usu commented Oct 21, 2019

jhamman commented Dec 2, 2019

choldgraf commented Dec 3, 2019

choldgraf commented Dec 4, 2019

sblack-usu commented Dec 4, 2019

choldgraf commented Dec 5, 2019 •

edited

betatim commented Dec 6, 2019

bitnik commented Dec 6, 2019

sblack-usu commented Dec 6, 2019

sblack-usu Jan 28, 2020

sblack-usu commented Jan 28, 2020

choldgraf commented Jan 28, 2020

sblack-usu commented Jan 31, 2020

choldgraf commented Feb 3, 2020

sblack-usu commented Feb 3, 2020

choldgraf commented Feb 3, 2020

jhamman commented Feb 3, 2020

sblack-usu commented Feb 3, 2020

choldgraf commented Feb 3, 2020

Navigation Menu

[MRG] add hydroshare as a repo provider #967

[MRG] add hydroshare as a repo provider #967

Conversation

sblack-usu commented Sep 28, 2019

nuest left a comment

Choose a reason for hiding this comment

nuest Oct 8, 2019

Choose a reason for hiding this comment

sblack-usu Oct 14, 2019

Choose a reason for hiding this comment

choldgraf Dec 4, 2019

Choose a reason for hiding this comment

sblack-usu commented Oct 21, 2019

jhamman commented Dec 2, 2019

choldgraf commented Dec 3, 2019

choldgraf commented Dec 4, 2019

sblack-usu commented Dec 4, 2019

choldgraf commented Dec 5, 2019 • edited

betatim commented Dec 6, 2019

bitnik commented Dec 6, 2019

sblack-usu commented Dec 6, 2019

sblack-usu Jan 28, 2020

Choose a reason for hiding this comment

sblack-usu commented Jan 28, 2020

choldgraf commented Jan 28, 2020

sblack-usu commented Jan 31, 2020

choldgraf commented Feb 3, 2020

sblack-usu commented Feb 3, 2020

choldgraf commented Feb 3, 2020

jhamman commented Feb 3, 2020

sblack-usu commented Feb 3, 2020

choldgraf commented Feb 3, 2020

choldgraf commented Dec 5, 2019 •

edited