Merge branch 'dev' into failing-monai-test

hjmjohnson · web-flow · commit e0c391f0d666 · 2024-07-10T13:23:20.000-05:00
diff --git a/runtests.sh b/runtests.sh
@@ -167,7 +167,7 @@ function clang_format {
 }
 
 function is_pip_installed() {
-	return $("${PY_EXE}" -c "import sys, pkgutil; sys.exit(0 if pkgutil.find_loader(sys.argv[1]) else 1)" $1)
+	return $("${PY_EXE}" -c "import sys, importlib.util; sys.exit(0 if importlib.util.find_spec(sys.argv[1]) else 1)" $1)
 }
 
 function clean_py {

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ function clang_format {`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`function is_pip_installed() {`
`170`		`- return $("${PY_EXE}" -c "import sys, pkgutil; sys.exit(0 if pkgutil.find_loader(sys.argv[1]) else 1)" $1)`
	`170`	`+ return $("${PY_EXE}" -c "import sys, importlib.util; sys.exit(0 if importlib.util.find_spec(sys.argv[1]) else 1)" $1)`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`function clean_py {`