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.

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

Rename dandi-staging to dandi-sandbox #1564

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 3 deletions dandi/cli/tests/test_instances.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ def test_cmd_instances(monkeypatch):
"dandi-api-local-docker-tests:\n"
f" api: http://{instancehost}:8000/api\n"
f" gui: http://{instancehost}:8085\n"
"dandi-staging:\n"
" api: https://api-staging.dandiarchive.org/api\n"
" gui: https://gui-staging.dandiarchive.org\n"
"dandi-sandbox:\n"
" api: https://api-sandbox.dandiarchive.org/api\n"
" gui: https://gui-sandbox.dandiarchive.org\n"
"linc:\n"
" api: https://api.lincbrain.org/api\n"
" gui: https://lincbrain.org\n"
Expand Down
4 changes: 2 additions & 2 deletions dandi/cli/tests/test_move.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"--regex",
"--work-on=remote",
"--dandi-instance",
"dandi-staging",
"dandi-sandbox",
"src.txt",
"dest/",
],
Expand All @@ -67,7 +67,7 @@
"jobs": 5,
"regex": True,
"work_on": "remote",
"dandi_instance": "dandi-staging",
"dandi_instance": "dandi-sandbox",
"devel_debug": False,
},
),
Expand Down
8 changes: 4 additions & 4 deletions dandi/consts.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,10 @@ def urls(self) -> Iterator[str]:
"https://dandiarchive.org",
"https://api.dandiarchive.org/api",
),
"dandi-staging": DandiInstance(
"dandi-staging",
"https://gui-staging.dandiarchive.org",
"https://api-staging.dandiarchive.org/api",
"dandi-sandbox": DandiInstance(
"dandi-sandbox",
"https://gui-sandbox.dandiarchive.org",
"https://api-sandbox.dandiarchive.org/api",
),
"dandi-api-local-docker-tests": DandiInstance(
"dandi-api-local-docker-tests",
Expand Down
6 changes: 3 additions & 3 deletions dandi/dandiapi.py
Original file line number Diff line number Diff line change
Expand Up @@ -413,8 +413,8 @@ def __init__(

:param str api_url: Base API URL of the server to interact with.
- For DANDI production, use ``"https://api.dandiarchive.org/api"``
- For DANDI staging, use
``"https://api-staging.dandiarchive.org/api"``
- For DANDI sandbox, use
``"https://api-sandbox.dandiarchive.org/api"``
:param str token: User API Key. Note that different instance APIs have
different keys.
"""
Expand Down Expand Up @@ -486,7 +486,7 @@ def dandi_authenticate(self) -> None:
it proves to be valid, it is stored in the user's keyring.

.. [#auth] E.g., "``dandi-api-dandi``" for the production server or
"``dandi-api-dandi-staging``" for the staging server
"``dandi-api-dandi-sandbox``" for the sandbox server
"""
# Shortcut for advanced folks
api_key = os.environ.get("DANDI_API_KEY", None)
Expand Down
2 changes: 1 addition & 1 deletion dandi/dandiarchive.py
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ def parse(
r"https?://deploy-preview-.*--gui-dandiarchive-org\.netlify\.app",
url_server,
):
url_server = "https://gui-staging.dandiarchive.org"
url_server = "https://gui-sandbox.dandiarchive.org"
instance = get_instance(url_server)
# asset_type = groups.get("asset_type")
dandiset_id = groups.get("dandiset_id")
Expand Down
6 changes: 3 additions & 3 deletions dandi/tests/test_dandiarchive.py
Original file line number Diff line number Diff line change
Expand Up @@ -306,9 +306,9 @@
),
),
(
"https://gui-staging.dandiarchive.org/#/dandiset/000018",
"https://gui-sandbox.dandiarchive.org/#/dandiset/000018",
DandisetURL(
instance=known_instances["dandi-staging"],
instance=known_instances["dandi-sandbox"],
dandiset_id="000018",
version_id=None,
),
Expand All @@ -317,7 +317,7 @@
"https://deploy-preview-854--gui-dandiarchive-org.netlify.app"
"/#/dandiset/000018",
DandisetURL(
instance=known_instances["dandi-staging"],
instance=known_instances["dandi-sandbox"],
dandiset_id="000018",
version_id=None,
),
Expand Down
6 changes: 3 additions & 3 deletions docs/source/cmdline/instances.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ Example output:
dandi-api-local-docker-tests:
api: http://localhost:8000/api
gui: http://localhost:8085
dandi-staging:
api: https://api-staging.dandiarchive.org/api
gui: https://gui-staging.dandiarchive.org
dandi-sandbox:
api: https://api-sandbox.dandiarchive.org/api
gui: https://gui-sandbox.dandiarchive.org
linc-staging:
api: https://staging-api.lincbrain.org/api
gui: https://staging.lincbrain.org
Expand Down
4 changes: 2 additions & 2 deletions docs/source/cmdline/move.rst
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@ Examples

dandi move --dandiset DANDI:123456 sub-01/sub-01_blah.nii.gz sub-02/sub-02_useful.nii.gz

To operate on Dandiset 123456 on ``dandi-staging``, you can use::
To operate on Dandiset 123456 on ``dandi-sandbox``, you can use::

dandi move --dandiset https://gui-staging.dandiarchive.org/dandiset/123456 sub-01/sub-01_blah.nii.gz sub-02/sub-02_useful.nii.gz
dandi move --dandiset https://gui-sandbox.dandiarchive.org/dandiset/123456 sub-01/sub-01_blah.nii.gz sub-02/sub-02_useful.nii.gz

- To move the contents of a folder :file:`rawdata/` to the top level of a
Dandiset, you can use the ``--regex`` option to strip the ``rawdata/`` prefix
Expand Down
Loading