From 710d9bf6a54269579e56be401f52ed04926fbacb Mon Sep 17 00:00:00 2001 From: lordwelch Date: Fri, 20 May 2022 00:19:33 -0700 Subject: [PATCH] Fix packaging issues Add wordninja datafile to pyinstaller Add publishers.json to the correct package --- comictagger.spec | 3 ++- setup.py | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/comictagger.spec b/comictagger.spec index 04c0b97..0f08e5e 100644 --- a/comictagger.spec +++ b/comictagger.spec @@ -3,6 +3,7 @@ import platform from os.path import join from comictaggerlib import ctversion +from PyInstaller.utils.hooks import get_module_file_attribute enable_console = False binaries = [] @@ -13,7 +14,7 @@ if platform.system() == "Windows": a = Analysis(['comictagger.py'], binaries=binaries, - datas=[('comictaggerlib/ui/*.ui', 'ui'), ('comictaggerlib/graphics', 'graphics')], + datas=[('comictaggerlib/ui/*.ui', 'ui'), ('comictaggerlib/graphics', 'graphics'), ('comicapi/data', 'comicapi/data'),(os.path.join(os.path.dirname(get_module_file_attribute('wordninja')),"wordninja"), "wordninja")], hiddenimports=['PIL'], hookspath=[], runtime_hooks=[], diff --git a/setup.py b/setup.py index f2267da..08cc0cf 100644 --- a/setup.py +++ b/setup.py @@ -54,9 +54,7 @@ setup( author_email="comictagger@gmail.com", url="https://github.com/comictagger/comictagger", packages=["comictaggerlib", "comicapi"], - package_data={ - "comictaggerlib": ["ui/*", "graphics/*", "data/*"], - }, + package_data={"comictaggerlib": ["ui/*", "graphics/*"], "comicapi": ["data/*"]}, entry_points=dict(console_scripts=["comictagger=comictaggerlib.main:ctmain"]), classifiers=[ "Development Status :: 4 - Beta",