Merge remote-tracking branch 'upstream/gating'

labsyspharm · Aug 8, 2023 · b7c069b · b7c069b
2 parents d95c57c + 6077a2c
commit b7c069b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/minerva_analysis/__init__.py b/minerva_analysis/__init__.py
@@ -12,6 +12,11 @@
 import sys
 import multiprocessing
 
+# Initialize sklearn global threadpool controller to avoid deadlock in threaded
+# contexts.
+import sklearn.utils.fixes
+sklearn.utils.fixes.threadpool_limits()
+
 # If you're running the pyinstaller version of the code, create a
 # new directory for the data (this will be at ~/ on mac)
 

diff --git a/minerva_analysis/client/package.json b/minerva_analysis/client/package.json
@@ -44,6 +44,7 @@
     "@babel/preset-typescript": "^7.17.12",
     "@babel/runtime": "^7.17.9",
     "@babel/runtime-corejs2": "^7.17.11",
+    "@babel/plugin-proposal-class-properties": "latest",
     "@httptoolkit/proxy-agent": "^5.0.1-socks-lookup-fix.0",
     "@types/chai": "^4.3.1",
     "@types/jquery": "^3.5.14",