-
Notifications
You must be signed in to change notification settings - Fork 394
[MRG] Add a repo provider for CKAN datasets #1833
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.
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
Merged
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
b3f9e7c
Add CKAN provider
u10313335 83768a1
Inline the parse_date function
u10313335 1ba7d01
Make the splitting logic more straightforward
u10313335 d083830
Handle the activities
u10313335 32a5341
Use urlencode to construct query strings
u10313335 4ad04ea
Cleanup URL parsing mechanisms
u10313335 2945d83
Add tests for dataset activities and non-CKAN datasets
u10313335 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,6 +22,7 @@ | |
"figshare": "Figshare", | ||
"hydroshare": "Hydroshare", | ||
"dataverse": "Dataverse", | ||
"ckan": "CKAN", | ||
} | ||
|
||
|
||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,6 +6,7 @@ | |
from tornado.ioloop import IOLoop | ||
|
||
from binderhub.repoproviders import ( | ||
CKANProvider, | ||
DataverseProvider, | ||
FigshareProvider, | ||
GistRepoProvider, | ||
|
@@ -209,6 +210,34 @@ async def test_dataverse( | |
assert spec == resolved_spec | ||
|
||
|
||
@pytest.mark.parametrize( | ||
"spec,resolved_spec,resolved_ref,resolved_ref_url,build_slug", | ||
[ | ||
[ | ||
"https://demo.ckan.org/dataset/sample-dataset-1", | ||
"https://demo.ckan.org/dataset/sample-dataset-1", | ||
"sample-dataset-1.v", | ||
"https://demo.ckan.org/dataset/sample-dataset-1", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you add some additional tests here for There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks, added. |
||
"ckan-sample-dataset-1", | ||
], | ||
], | ||
) | ||
async def test_ckan(spec, resolved_spec, resolved_ref, resolved_ref_url, build_slug): | ||
provider = CKANProvider(spec=spec) | ||
|
||
ref = await provider.get_resolved_ref() | ||
assert resolved_ref in ref | ||
|
||
slug = provider.get_build_slug() | ||
assert slug == build_slug | ||
repo_url = provider.get_repo_url() | ||
assert repo_url == spec | ||
ref_url = await provider.get_resolved_ref_url() | ||
assert ref_url == resolved_ref_url | ||
spec = await provider.get_resolved_spec() | ||
assert spec == resolved_spec | ||
|
||
|
||
@pytest.mark.github_api | ||
@pytest.mark.parametrize( | ||
"repo,unresolved_ref,resolved_ref", | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Update this to use the parsing changes in jupyterhub/repo2docker#1336 (comment)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure and updated.