Merge pull request #364 from dandi/gh-362

Adjust license metadata conversion
dandi · Feb 5, 2021 · fc56dfb · fc56dfb
2 parents 500d1a9 + 0427ccf
commit fc56dfb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/dandi/metadata.py b/dandi/metadata.py
@@ -425,10 +425,9 @@ def convertv1(data):
                 )
             ]
         if oldkey == "license":
-            newvalues = []
-            for val in value:
-                newvalues.append(getattr(models.LicenseType, val.split(":")[-1]))
-            value = newvalues
+            value = [
+                getattr(models.LicenseType, value.replace("-", "").replace(".", ""))
+            ]
         if oldkey == "identifier":
             value = f"DANDI:{value}"
         if len(mapping[oldkey]) == 2:
@@ -475,7 +474,7 @@ def convertv1(data):
                 if oldkey == "sex":
                     vm["value"] = value
                 else:
-                    if "maximum" in value:
+                    if "maximum" in value and isinstance(value["maximum"], str):
                         if "days" in value["maximum"]:
                             value["units"] = "days"
                         if "Gestational" in value["maximum"]:
@@ -486,7 +485,7 @@ def convertv1(data):
                             value["units"] = value["maximum"][-1]
                         if "None" not in value["maximum"]:
                             value["maximum"] = float(value["maximum"].split()[0])
-                    if "minimum" in value:
+                    if "minimum" in value and isinstance(value["minimum"], str):
                         if "days" in value["minimum"]:
                             value["units"] = "days"
                         if "Gestational" in value["minimum"]:

diff --git a/dandi/tests/test_metadata.py b/dandi/tests/test_metadata.py
@@ -475,7 +475,7 @@ def test_dandimeta_migration(schema_dir):
                     "single-neurons",
                 ],
                 "language": "English",
-                "license": ["dandi:CCBY40"],
+                "license": "CC-BY-4.0",
                 "name": (
                     "A NWB-based dataset and processing pipeline of human"
                     " single-neuron activity during a declarative memory task"