Merge branch 'master' of https://github.com/dandi/dandi-schema into description-length

Author: kabilar

README.md

@@ -35,6 +35,6 @@ out of the Pydantic models.
 ## Resources
 
 * To learn how to interact with the DANDI archive,
-see [the handbook](https://www.dandiarchive.org/handbook/).
+see the [DANDI Docs](https://docs.dandiarchive.org).
 * To file a feature request or bug report, go to https://github.com/dandi/helpdesk/issues/new/choose.
 * For all other issues, contact the DANDI team: help@dandiarchive.org.

dandischema/consts.py

@@ -1,4 +1,4 @@
-DANDI_SCHEMA_VERSION = "0.6.9"
+DANDI_SCHEMA_VERSION = "0.6.10"
 ALLOWED_INPUT_SCHEMAS = [
     "0.4.4",
     "0.5.1",
@@ -12,15 +12,17 @@
     "0.6.6",
     "0.6.7",
     "0.6.8",
+    "0.6.9",
+    DANDI_SCHEMA_VERSION,
 ]
 
 # ATM we allow only for a single target version which is current
 # migrate has a guard now for this since it cannot migrate to anything but current
 # version
 ALLOWED_TARGET_SCHEMAS = [DANDI_SCHEMA_VERSION]
+
 # This allows multiple schemas for validation, whereas target schemas focus on
 # migration.
-ALLOWED_VALIDATION_SCHEMAS = ALLOWED_TARGET_SCHEMAS + ALLOWED_INPUT_SCHEMAS
-
-if DANDI_SCHEMA_VERSION not in ALLOWED_INPUT_SCHEMAS:
-    ALLOWED_INPUT_SCHEMAS.append(DANDI_SCHEMA_VERSION)
+ALLOWED_VALIDATION_SCHEMAS = sorted(
+    set(ALLOWED_INPUT_SCHEMAS).union(ALLOWED_TARGET_SCHEMAS)
+)