fix(build): fix pyinstaller build (#1566)

Signed-off-by: Sylvain Leclerc <[email protected]>
Co-authored-by: Sylvain Leclerc <[email protected]>

.github/workflows/deploy.yml

@@ -3,15 +3,15 @@ on:
   push:
     branches:
       - 'master'
-
+      - 'hotfix/**'
 
 jobs:
   binary:
     runs-on: ${{ matrix.os }}
     strategy:
       max-parallel: 3
       matrix:
-        os: [windows-latest, ubuntu-20.04]
+        os: [ windows-latest, ubuntu-20.04 ]
 
     steps:
       - name: Checkout github repo (+ download lfs dependencies)
@@ -59,17 +59,17 @@ jobs:
         if: matrix.os == 'windows-latest'
         run: |
           git log -1 HEAD --format=%H > .\resources\commit_id
-          pyinstaller -F antarest\worker\archive_worker_service.py -n AntaresWebWorker --add-data ".\resources;.\resources"
+          pyinstaller -F antarest\worker\archive_worker_service.py -n AntaresWebWorker --add-data ".\resources;.\resources" --hidden-import 'pythonjsonlogger.jsonlogger'
       - name: Generate Linux worker binary
         if: matrix.os == 'ubuntu-20.04'
         run: |
-          git log -1 HEAD --format=%H > .\resources\commit_id
-          pyinstaller -F antarest/worker/archive_worker_service.py -n AntaresWebWorker --add-data resources:resources
+          git log -1 HEAD --format=%H > ./resources/commit_id
+          pyinstaller -F antarest/worker/archive_worker_service.py -n AntaresWebWorker --add-data resources:resources --hidden-import 'pythonjsonlogger.jsonlogger'
       - name: Packaging
         run: bash ./package_antares_web.sh
         working-directory: scripts
       - name: install changelog requirements
-        run : npm install -g auto-changelog
+        run: npm install -g auto-changelog
       - name: generate changelog file
         run: |
           auto-changelog -l false --hide-empty-releases

AntaresWebLinux.spec

@@ -1,13 +1,23 @@
 # -*- mode: python ; coding: utf-8 -*-
-
+from pathlib import Path
 
 block_cipher = None
 
-antares_web_server_a = Analysis(['antarest/gui.py'],
+# 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']
+
+antares_web_server_a = Analysis(['antarest/gui.py', 'alembic/env.py'] + migration_files,
              pathex=[],
              binaries=[('./alembic.ini', './alembic.ini')],
              datas=[('./resources', './resources'), ('./alembic', './alembic')],
-             hiddenimports=['cmath', 'antarest.dbmodel', 'plyer.platforms.linux', 'plyer.platforms.linux.notification'],
+             hiddenimports=[
+                 'cmath',
+                 'antarest.dbmodel',
+                 'plyer.platforms.linux',
+                 'plyer.platforms.linux.notification',
+                 'pythonjsonlogger.jsonlogger',
+             ],
              hookspath=['extra-hooks'],
              hooksconfig={},
              runtime_hooks=[],

AntaresWebWin.spec

@@ -1,13 +1,23 @@
 # -*- mode: python ; coding: utf-8 -*-
-
+from pathlib import Path
 
 block_cipher = None
 
-antares_web_server_a = Analysis(['antarest/gui.py'],
+# 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']
+
+antares_web_server_a = Analysis(['antarest/gui.py', 'alembic/env.py'] + migration_files,
              pathex=[],
              binaries=[('./alembic.ini', './alembic.ini')],
              datas=[('./resources', './resources'), ('./alembic', './alembic')],
-             hiddenimports=['cmath', 'antarest.dbmodel', 'plyer.platforms.win', 'plyer.platforms.win.notification'],
+             hiddenimports=[
+                 'cmath',
+                 'antarest.dbmodel',
+                 'plyer.platforms.win',
+                 'plyer.platforms.win.notification',
+                 'pythonjsonlogger.jsonlogger',
+             ],
              hookspath=['extra-hooks'],
              hooksconfig={},
              runtime_hooks=[],