diff --git a/.github/workflows/pyinstaller.yml b/.github/workflows/pyinstaller.yml index 4073c13..65a48f1 100644 --- a/.github/workflows/pyinstaller.yml +++ b/.github/workflows/pyinstaller.yml @@ -24,6 +24,9 @@ jobs: from-pipfile: true dev: true + - name: Install current package + run: pip install . + - name: Run PyInstaller run: "pyinstaller BlackboardSync.spec --noconfirm --clean" diff --git a/BlackboardSync.spec b/BlackboardSync.spec index 024d7e3..3d55661 100644 --- a/BlackboardSync.spec +++ b/BlackboardSync.spec @@ -1,6 +1,7 @@ # -*- mode: python ; coding: utf-8 -*- import platform +from PyInstaller.utils.hooks import copy_metadata def get_icon(): @@ -11,11 +12,13 @@ def get_icon(): def get_datas(): s = "\\" if platform.system() == "Windows" else "/" + metadata = copy_metadata('blackboardsync')[0] return [ (f"blackboard_sync{s}assets", f"blackboard_sync{s}assets"), (f"blackboard_sync{s}qt", f"blackboard_sync{s}qt"), - (f"blackboard_sync{s}universities.json", f"blackboard_sync") + (f"blackboard_sync{s}universities.json", f"blackboard_sync"), + metadata ] a = Analysis( diff --git a/blackboard_sync/sync_controller.py b/blackboard_sync/sync_controller.py index 2a3d24a..b84d54d 100644 --- a/blackboard_sync/sync_controller.py +++ b/blackboard_sync/sync_controller.py @@ -72,9 +72,10 @@ def force_sync(self) -> None: def open_settings(self) -> None: __version__ = None + package = __package__.replace('_', '') try: - __version__ = get_version(__package__) + __version__ = get_version(package) except PackageNotFoundError: pass