Merge branch 'master' into dependabot/github_actions/actions/checkout-6

Author: candleindark

DEVELOPMENT.md

@@ -90,6 +90,18 @@ development command line options.
 - `DANDI_TESTS_NO_VCR` — When set, the use of vcrpy to playback captured HTTP
   requests during testing will be disabled
 
+- `DANDI_TESTS_INSTANCE_NAME` -- Sets the instance name for the dandi-archive instance used for
+  testing. Defaults to `"DANDI"`. Useful for testing dandi-cli against a dandi-archive instance with
+  a particular vendor information.
+
+- `DANDI_TESTS_INSTANCE_IDENTIFIER` -- Sets the instance identifier (RRID) for the dandi-archive
+  instance used for testing. Defaults to `"RRID:ABC_123456"`. Useful for testing dandi-cli against
+  a dandi-archive instance with a particular vendor information.
+
+- `DANDI_TESTS_DOI_PREFIX` -- Sets the DOI API prefix for the dandi-archive instance used for
+  testing. Defaults to `"10.80507"`. Useful for testing dandi-cli against a dandi-archive instance
+  with a particular vendor information.
+
 - `DANDI_DEVEL_INSTRUMENT_REQUESTS_SUPERLEN` -- When set, the `upload()`
   function will patch `requests` to log the results of calls to
   `requests.utils.super_len()`

dandi/dandiset.py

@@ -139,9 +139,9 @@ def _get_identifier(metadata: dict) -> str | None:
             id_ = str(id_.get("value", ""))
         elif id_ is not None:
             assert isinstance(id_, str)
-            if id_.startswith("DANDI:"):
-                # result of https://github.com/dandi/dandi-cli/pull/348 which
-                id_ = id_[len("DANDI:") :]
+            # result of https://github.com/dandi/dandi-cli/pull/348 which ???
+            # TODO: RF to avoid this evil!!!
+            id_ = id_.split(":", maxsplit=1)[-1]
 
         assert id_ is None or isinstance(id_, str)
         return id_

dandi/tests/data/dandiarchive-docker/docker-compose.yml

@@ -36,9 +36,9 @@ services:
       DJANGO_DANDI_WEB_APP_URL: http://localhost:8085
       DJANGO_DANDI_API_URL: http://localhost:8000
       DJANGO_DANDI_JUPYTERHUB_URL: https://hub.dandiarchive.org
-      DJANGO_DANDI_INSTANCE_NAME: DANDI
-      DJANGO_DANDI_INSTANCE_IDENTIFIER: RRID:ABC_123456
-      DJANGO_DANDI_DOI_API_PREFIX: "10.80507"
+      DJANGO_DANDI_INSTANCE_NAME: ${DANDI_TESTS_INSTANCE_NAME:-DANDI}
+      DJANGO_DANDI_INSTANCE_IDENTIFIER: ${DANDI_TESTS_INSTANCE_IDENTIFIER:-RRID:ABC_123456}
+      DJANGO_DANDI_DOI_API_PREFIX: ${DANDI_TESTS_DOI_PREFIX:-10.80507}
     ports:
       - "127.0.0.1:8000:8000"
 

pyproject.toml

@@ -49,7 +49,7 @@ dependencies = [
     # >=8.2.0: https://github.com/pallets/click/issues/2911
     "click >= 7.1, <8.2.0",
     "click-didyoumean",
-    "dandischema >= 0.11.1, < 0.12.0",
+    "dandischema ~= 0.12.0",
     "etelemetry >= 0.2.2",
     # For pydantic to be able to use type annotations like `X | None`
     "eval_type_backport; python_version < '3.10'",