Skip to content

Commit

Permalink
added detection-presets to manifest.in
Browse files Browse the repository at this point in the history
  • Loading branch information
cudmore committed Nov 22, 2023
1 parent e5db5d6 commit dec3813
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 3 deletions.
3 changes: 2 additions & 1 deletion manifest.in
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
recursive-include sanpy/_userFiles ['.py', 'abf']
recursive-include sanpy/_userFiles ['.py', 'abf']
recursive-include sanpy/detection-presets ['.json']
8 changes: 6 additions & 2 deletions pyinstaller/macos/build_x86.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,13 @@ conda activate sanpy-pyinstaller-i386

pip install --upgrade pip

pip install -e '../../.[gui]'
pip install '../../.[gui]'
# pip install -e '../../.[gui]'

pip install -e ~/Sites/pyinstaller/.
# 20231122, switched back to most recent pyinstaller
# pip install -e ~/Sites/pyinstaller/.
#pip install --upgrade pyinstaller
pip install ../../pyinstaller_20231122/pyinstaller/.

python macos_build.py

Expand Down
4 changes: 4 additions & 0 deletions pyinstaller/macos/macos.spec
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,11 @@ exe = EXE(
argv_emulation=False,
# TODO: replace this with --target-arch
#target_arch='x86_64', # x86_64, arm64, universal2

# 20231122, app is failing security check
# tring to fix by turning this off
codesign_identity="Developer ID Application: Robert Cudmore (794C773KDS)",

entitlements_file="entitlements.plist",
icon='sanpy_transparent.icns',
)
Expand Down
6 changes: 6 additions & 0 deletions sanpy/interface/sanpy_app.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Author: Robert H Cudmore
# Date: 20190719

from multiprocessing import freeze_support
freeze_support()

#from curses.panel import bottom_panel
import os, sys

Expand Down Expand Up @@ -1499,6 +1502,9 @@ def main():
Configured in setup.py
"""
# logger.info('calling freeze support')
# freeze_support()

logger.info(f"Starting sanpy_app.py in main()")
# date_time_str = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
# logger.info(f' {date_time_str}')
Expand Down
4 changes: 4 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@
'scipy',
'pyabf',
'tifffile',

# on 20231122 with newer 3.8.2 pyInstaller macOS app was hanging with 'building font cache'
#'matplotlib==3.8.0',
'matplotlib',

'mplcursors',
'seaborn',
'requests', # to load from the cloud (for now github)
Expand Down

0 comments on commit dec3813

Please sign in to comment.