Missing libs, some more/ release fixes

Author: bethac07

distribution/macos/CellProfiler-Analyst.spec

@@ -15,6 +15,7 @@ datas = []
 
 datas += PyInstaller.utils.hooks.collect_data_files("bioformats")
 datas += PyInstaller.utils.hooks.collect_data_files("javabridge")
+datas += PyInstaller.utils.hooks.collect_data_files("scipy.libs")
 
 datas += [
     ("../../cpa/icons/*", "cpa/icons"),

distribution/macos/osx-codesign.sh

@@ -2,17 +2,12 @@
 
 cd ./dist/CellProfiler-Analyst.app/Contents/Resources
 sudo rm -r Home/legal/
-echo "do 1"
 sudo codesign --timestamp -s "Developer ID Application: Beth Cimini (27YQ9U45D9)" Home/lib/server/classes.jsa
-echo "done 1"
 find . -type f | xargs -I file codesign --timestamp -f -s "Developer ID Application: Beth Cimini (27YQ9U45D9)" file
 cd ../MacOS
 find . -type f | xargs -I file sudo codesign --timestamp -f -s "Developer ID Application: Beth Cimini (27YQ9U45D9)" file
-echo "do 2"
 codesign --timestamp -f -s "Developer ID Application: Beth Cimini (27YQ9U45D9)" _elementtree.cpython-38-darwin.so
-echo "done 2, doing 3"
 codesign --entitlements entitlements.plist --timestamp -o runtime -s "Developer ID Application: Beth Cimini (27YQ9U45D9)" ./cpanalyst
-echo "done 3"
 cd ..
 codesign --timestamp -s "Developer ID Application: Beth Cimini (27YQ9U45D9)" Info.plist
 

distribution/windows/CellProfiler-Analyst.spec

@@ -7,14 +7,15 @@ import PyInstaller.compat
 import PyInstaller.utils.hooks
 
 binaries = []
-binaries += PyInstaller.utils.hooks.collect_dynamic_libs("scipy")
+binaries += PyInstaller.utils.hooks.collect_dynamic_libs("scipy.libs")
 
 block_cipher = None
 
 datas = []
 
 datas += PyInstaller.utils.hooks.collect_data_files("bioformats")
 datas += PyInstaller.utils.hooks.collect_data_files("javabridge")
+datas += PyInstaller.utils.hooks.collect_data_files("scipy.libs")
 
 datas += [
     ("../../cpa/icons/*", "cpa/icons"),