Skip to content
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

Jump to bottom

Include LINC API as a supported instance type for DANDI CLI #1527

Merged
merged 3 commits into from
Nov 15, 2024
Merged

Include LINC API as a supported instance type for DANDI CLI #1527

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ad60a1
Include LINC API as a supported instance type for DANDI CLI
Nov 15, 2024
e6bf1a7
revert uncommented out code
Nov 15, 2024
284ead1
bump docs for instances
Nov 15, 2024
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
6 changes: 6 additions & 0 deletions dandi/cli/tests/test_instances.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,10 @@ def test_cmd_instances(monkeypatch):
"dandi-staging:\n"
" api: https://api-staging.dandiarchive.org/api\n"
" gui: https://gui-staging.dandiarchive.org\n"
"linc:\n"
" api: https://api.lincbrain.org/api\n"
" gui: https://lincbrain.org\n"
"linc-staging:\n"
" api: https://staging-api.lincbrain.org/api\n"
" gui: https://staging.lincbrain.org\n"
)
10 changes: 10 additions & 0 deletions dandi/consts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,16 @@ def urls(self) -> Iterator[str]:
f"http://{instancehost}:8085",
f"http://{instancehost}:8000/api",
),
"linc": DandiInstance(
"linc",
"https://lincbrain.org",
"https://api.lincbrain.org/api",
),
"linc-staging": DandiInstance(
"linc-staging",
"https://staging.lincbrain.org",
"https://staging-api.lincbrain.org/api",
)
}
# to map back url: name
known_instances_rev = {
Expand Down
9 changes: 5 additions & 4 deletions dandi/tests/test_dandiarchive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,10 +439,11 @@ def test_known_instances() -> None:
def test_parse_dandi_url_unknown_instance() -> None:
with pytest.raises(UnknownURLError) as excinfo:
parse_dandi_url("dandi://not-an-instance/000001")
assert str(excinfo.value) == (
"Unknown instance 'not-an-instance'. Valid instances: dandi,"
" dandi-api-local-docker-tests, dandi-staging"
)

valid_instances = ", ".join(sorted(known_instances.keys()))
expected_message = f"Unknown instance 'not-an-instance'. Valid instances: {valid_instances}"

assert str(excinfo.value) == expected_message


@mark.skipif_no_network
Expand Down
Loading