Merge branch 'main' into fix-dandi-waiting

NeurodataWithoutBorders · Mar 9, 2024 · 20c359d · 20c359d
2 parents b412199 + 1a86f2f
commit 20c359d
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/environments/environment-Linux.yml b/environments/environment-Linux.yml
@@ -9,16 +9,16 @@ dependencies:
   - numcodecs = 0.11.0
   # install these from conda-forge so that dependent packages get included in the distributable
   - jsonschema = 4.18.0  # installs jsonschema-specifications
-  - pydantic[email] = 1.10.12  # installs email-validator
   - pip
   - pip:
+      - pyinstaller-hooks-contrib == 2024.2  # Fix needed for pydantic v2; otherwise imports pydantic.compiled
       - chardet == 5.1.0
       - configparser == 6.0.0
       - flask == 2.3.2
       - flask-cors == 4.0.0
       - flask_restx == 1.1.0
-      - neuroconv @ git+https://github.com/catalystneuro/neuroconv.git@main#neuroconv[full]
-      - dandi >= 0.58.1
+      - neuroconv @ git+https://github.com/catalystneuro/neuroconv.git@try_remove_packaing_bound#neuroconv[full]
+      - dandi >= 0.60.0
       - pytest == 7.4.0
       - pytest-cov == 4.1.0
       - scikit-learn == 1.4.0
diff --git a/environments/environment-MAC-arm64.yml b/environments/environment-MAC-arm64.yml
@@ -13,7 +13,6 @@ dependencies:
   - pytables = 3.8 # pypi build fails on arm64 so install from conda-forge (used by neuroconv deps)
   # install these from conda-forge so that dependent packages get included in the distributable
   - jsonschema = 4.18.0  # installs jsonschema-specifications
-  - pydantic[email] = 1.10.12  # installs email-validator
   - pip
   - pip:
       - chardet == 5.1.0
@@ -22,7 +21,7 @@ dependencies:
       - flask-cors == 4.0.0
       - flask_restx == 1.1.0
       - neuroconv @ git+https://github.com/catalystneuro/neuroconv.git@main#neuroconv[full]
-      - dandi >= 0.58.1
+      - dandi >= 0.60.0
       - pytest == 7.4.0
       - pytest-cov == 4.1.0
       - scikit-learn == 1.4.0
diff --git a/environments/environment-MAC.yml b/environments/environment-MAC.yml
@@ -9,7 +9,6 @@ dependencies:
   - numcodecs = 0.11.0
   # install these from conda-forge so that dependent packages get included in the distributable
   - jsonschema = 4.18.0  # installs jsonschema-specifications
-  - pydantic[email] = 1.10.12  # installs email-validator
   - pip
   - pip:
       - chardet == 5.1.0
@@ -18,7 +17,7 @@ dependencies:
       - flask-cors == 4.0.0
       - flask_restx == 1.1.0
       - neuroconv @ git+https://github.com/catalystneuro/neuroconv.git@main#neuroconv[full]
-      - dandi >= 0.58.1
+      - dandi >= 0.60.0
       - pytest == 7.4.0
       - pytest-cov == 4.1.0
       - scikit-learn == 1.4.0
diff --git a/environments/environment-Windows.yml b/environments/environment-Windows.yml
@@ -9,16 +9,16 @@ dependencies:
   - pywin32 = 303
   - git = 2.20.1
   - setuptools = 58.0.4
-  - pydantic[email] = 1.10.12 # installs email-validator
   - pip
   - pip:
+      - pyinstaller-hooks-contrib == 2024.2  # Fix needed for pydantic v2; otherwise imports pydantic.compiled
       - chardet == 5.1.0
       - configparser == 6.0.0
       - flask == 2.3.2
       - flask-cors === 3.0.10
       - flask_restx == 1.1.0
-      - neuroconv @ git+https://github.com/catalystneuro/neuroconv.git@main#neuroconv[full]
-      - dandi >= 0.58.1
+      - neuroconv @ git+https://github.com/catalystneuro/neuroconv.git@try_remove_packaing_bound#neuroconv[full]
+      - dandi >= 0.60.0
       - pytest == 7.2.2
       - pytest-cov == 4.1.0
       - scikit-learn == 1.4.0
diff --git a/src/renderer/src/stories/JSONSchemaForm.js b/src/renderer/src/stories/JSONSchemaForm.js
@@ -428,10 +428,10 @@ export class JSONSchemaForm extends LitElement {
 
                 const isRow = typeof rowName === "number";
 
-                const resolvedValue = e.path.reduce((acc, token) => acc[token], resolved);
+                const resolvedValue = e.instance; // Get offending value
+                const schema = e.schema; // Get offending schema
 
                 // ------------ Exclude Certain Errors ------------
-
                 // Allow for constructing types from object types
                 if (e.message.includes("is not of a type(s)") && "properties" in schema && schema.type === "string")
                     return;

diff --git a/src/renderer/src/stories/Search.js b/src/renderer/src/stories/Search.js
@@ -455,7 +455,8 @@ export class Search extends LitElement {
       }}
 
       @blur=${(blurEvent) => {
-          if (blurEvent.relatedTarget.classList.contains("option")) return;
+          const relatedTarget = blurEvent.relatedTarget;
+          if (relatedTarget && relatedTarget.classList.contains("option")) return;
           this.submit();
       }}