From 3c16600c539cd192e25058ad482112dec958448b Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Wed, 1 May 2019 14:54:49 +0300 Subject: [PATCH] Include sqlalchemy's baked in mac/windows specs as well --- dist_assets/mac/pyfa.spec | 5 +++-- dist_assets/win/pyfa.spec | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dist_assets/mac/pyfa.spec b/dist_assets/mac/pyfa.spec index a461774de..f7749eec7 100644 --- a/dist_assets/mac/pyfa.spec +++ b/dist_assets/mac/pyfa.spec @@ -29,7 +29,8 @@ added_files = [ import_these = [ - 'numpy.core._dtype_ctypes' # https://github.com/pyinstaller/pyinstaller/issues/3982 + 'numpy.core._dtype_ctypes', # https://github.com/pyinstaller/pyinstaller/issues/3982 + 'sqlalchemy.ext.baked' # windows build doesn't launch without if when using sqlalchemy 1.3.x ] icon = os.path.join(os.getcwd(), "dist_assets", "mac", "pyfa.icns") @@ -86,4 +87,4 @@ app = BUNDLE( 'CFBundleDisplayName': 'pyfa', 'CFBundleIdentifier': 'org.pyfaorg.pyfa', } -) \ No newline at end of file +) diff --git a/dist_assets/win/pyfa.spec b/dist_assets/win/pyfa.spec index 09fac9e28..0de2c2ebb 100644 --- a/dist_assets/win/pyfa.spec +++ b/dist_assets/win/pyfa.spec @@ -17,7 +17,7 @@ added_files = [ ('../../imgs/gui/*.gif', 'imgs/gui'), ('../../imgs/icons/*.png', 'imgs/icons'), ('../../imgs/renders/*.png', 'imgs/renders'), - ('../../service/jargon/*.yaml', 'service/jargon'), + ('../../service/jargon/*.yaml', 'service/jargon'), ('../../dist_assets/win/pyfa.ico', '.'), ('../../dist_assets/win/pyfa.exe.manifest', '.'), ('../../dist_assets/win/Microsoft.VC90.CRT.manifest', '.'), @@ -29,7 +29,8 @@ added_files = [ ] import_these = [ - 'numpy.core._dtype_ctypes' # https://github.com/pyinstaller/pyinstaller/issues/3982 + 'numpy.core._dtype_ctypes', # https://github.com/pyinstaller/pyinstaller/issues/3982 + 'sqlalchemy.ext.baked' # windows build doesn't launch without if when using sqlalchemy 1.3.x ] # Walk directories that do dynamic importing