From 89cf7a6b32f22087ab1bc928be34162ba1584293 Mon Sep 17 00:00:00 2001 From: Ryan Ly Date: Fri, 26 Apr 2024 03:11:33 -0500 Subject: [PATCH 1/2] Fix spelling of netlify --- CHANGELOG.md | 2 +- dandi/dandiarchive.py | 2 +- docs/source/ref/urls.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6085949fb..3d38b5290 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2114,7 +2114,7 @@ - Fixes [#330](https://github.com/dandi/dandi-cli/pull/330) ([@jwodder](https://github.com/jwodder)) - Rename DANDI_API_KEY to DANDI_GIRDER_API_KEY [#330](https://github.com/dandi/dandi-cli/pull/330) ([@jwodder](https://github.com/jwodder)) - Test of uploading & downloading via new API [#330](https://github.com/dandi/dandi-cli/pull/330) ([@jwodder](https://github.com/jwodder)) -- RF+ENH: support mapping for direct API urls, and use netflify insstance instead of api+ prefix [#330](https://github.com/dandi/dandi-cli/pull/330) ([@yarikoptic](https://github.com/yarikoptic)) +- RF+ENH: support mapping for direct API urls, and use netlify insstance instead of api+ prefix [#330](https://github.com/dandi/dandi-cli/pull/330) ([@yarikoptic](https://github.com/yarikoptic)) - Delint [#330](https://github.com/dandi/dandi-cli/pull/330) ([@jwodder](https://github.com/jwodder)) - RF: account for web UI URL changes/dropped features, remove support for girder URLs [#330](https://github.com/dandi/dandi-cli/pull/330) ([@yarikoptic](https://github.com/yarikoptic)) - Handle uploading already-extant assets [#330](https://github.com/dandi/dandi-cli/pull/330) ([@jwodder](https://github.com/jwodder)) diff --git a/dandi/dandiarchive.py b/dandi/dandiarchive.py index 53c3506cb..cf7dec4c6 100644 --- a/dandi/dandiarchive.py +++ b/dandi/dandiarchive.py @@ -604,7 +604,7 @@ class _dandi_url_parser: ( re.compile(r"https?://[^/]*dandiarchive-org\.netlify\.app/.*"), {"map_instance": "dandi"}, - "https://*dandiarchive-org.netflify.app/...", + "https://*dandiarchive-org.netlify.app/...", ), # Direct urls to our new API ( diff --git a/docs/source/ref/urls.rst b/docs/source/ref/urls.rst index bd3f7ca7f..a1cc1a058 100644 --- a/docs/source/ref/urls.rst +++ b/docs/source/ref/urls.rst @@ -22,7 +22,7 @@ has one, and its draft version will be used otherwise. `parse_dandi_url()` converts this format to a `DandisetURL`. - Any ``https://gui.dandiarchive.org/`` or - ``https://*dandiarchive-org.netflify.app/`` URL which redirects to + ``https://*dandiarchive-org.netlify.app/`` URL which redirects to one of the other URL formats - :samp:`https://{server}[/api]/[#/]dandiset/{dandiset-id}[/{version}][/files]` From fb8bd638746c4c227a314e8256817d1d8e6e9701 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Fri, 3 May 2024 10:05:41 -0400 Subject: [PATCH 2/2] insstance typo fix --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d38b5290..85d96fece 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2114,7 +2114,7 @@ - Fixes [#330](https://github.com/dandi/dandi-cli/pull/330) ([@jwodder](https://github.com/jwodder)) - Rename DANDI_API_KEY to DANDI_GIRDER_API_KEY [#330](https://github.com/dandi/dandi-cli/pull/330) ([@jwodder](https://github.com/jwodder)) - Test of uploading & downloading via new API [#330](https://github.com/dandi/dandi-cli/pull/330) ([@jwodder](https://github.com/jwodder)) -- RF+ENH: support mapping for direct API urls, and use netlify insstance instead of api+ prefix [#330](https://github.com/dandi/dandi-cli/pull/330) ([@yarikoptic](https://github.com/yarikoptic)) +- RF+ENH: support mapping for direct API urls, and use netlify instance instead of api+ prefix [#330](https://github.com/dandi/dandi-cli/pull/330) ([@yarikoptic](https://github.com/yarikoptic)) - Delint [#330](https://github.com/dandi/dandi-cli/pull/330) ([@jwodder](https://github.com/jwodder)) - RF: account for web UI URL changes/dropped features, remove support for girder URLs [#330](https://github.com/dandi/dandi-cli/pull/330) ([@yarikoptic](https://github.com/yarikoptic)) - Handle uploading already-extant assets [#330](https://github.com/dandi/dandi-cli/pull/330) ([@jwodder](https://github.com/jwodder))