Skip to content

Commit

Permalink
test with binaries and v4.10
Browse files Browse the repository at this point in the history
  • Loading branch information
MartinBelthle committed May 23, 2024
1 parent 81bd2ee commit f4e0790
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
5 changes: 4 additions & 1 deletion AntaresWebLinux.spec
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
# -*- mode: python ; coding: utf-8 -*-
from pathlib import Path
from PyInstaller.utils.hooks import collect_dynamic_libs

block_cipher = None

# We need to analyze all alembic files to be sure the migration phase works fine
migrations_dir = Path('alembic/versions')
migration_files = [str(f) for f in migrations_dir.iterdir() if f.is_file() and f.suffix == '.py']

binaries = [('./alembic.ini', './alembic.ini')] + collect_dynamic_libs('tables')

antares_web_server_a = Analysis(['antarest/gui.py', 'alembic/env.py'] + migration_files,
pathex=[],
binaries=[('./alembic.ini', './alembic.ini')],
binaries=binaries,
datas=[('./resources', './resources'), ('./alembic', './alembic')],
hiddenimports=[
'cmath',
Expand Down
6 changes: 2 additions & 4 deletions AntaresWebWin.spec
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,10 @@ migration_files = [str(f) for f in migrations_dir.iterdir() if f.is_file() and f

# Specify hidden import
tables_files = collect_data_files('tables')
xlsx_files = collect_data_files('xlsxwriter')
datas = [('./resources', './resources'), ('./alembic', './alembic')] + tables_files + xlsx_files
datas = [('./resources', './resources'), ('./alembic', './alembic')] + tables_files

tables_module = collect_submodules('tables')
xlsx_module = collect_submodules('xlsxwriter')
hidden_imports = ['cmath', 'antarest.dbmodel', 'plyer.platforms.win', 'plyer.platforms.win.notification', 'pythonjsonlogger.jsonlogger'] + tables_module + xlsx_module
hidden_imports = ['cmath', 'antarest.dbmodel', 'plyer.platforms.win', 'plyer.platforms.win.notification', 'pythonjsonlogger.jsonlogger'] + tables_module

antares_web_server_a = Analysis(['antarest/gui.py', 'alembic/env.py'] + migration_files,
pathex=[],
Expand Down
4 changes: 2 additions & 2 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
black~=23.7.0
isort~=5.12.0
mypy~=1.4.1
pyinstaller==5.0.1
pyinstaller-hooks-contrib==2024.6
pyinstaller==4.10
pyinstaller-hooks-contrib==2024.4

# Extra requirements installed by `mypy --install-types`.
# IMPORTANT: Make sure the versions of these typing libraries match the versions
Expand Down

0 comments on commit f4e0790

Please sign in to comment.