Fix packaging issues

Add wordninja datafile to pyinstaller
Add publishers.json to the correct package

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=[],

comictaggerlib/comicvinetalker.py

@@ -736,7 +736,7 @@ class ComicVineTalker:
         self.nam.finished.connect(self.async_fetch_issue_cover_url_complete)
         self.nam.get(QtNetwork.QNetworkRequest(QtCore.QUrl(issue_url)))
 
-    def async_fetch_issue_cover_url_complete(self, reply: QtNetwork.QNetworkReply) -> None:
+    def async_fetch_issue_cover_url_complete(self, reply: "QtNetwork.QNetworkReply") -> None:
         # read in the response
         data = reply.readAll()
 
@@ -772,7 +772,7 @@ class ComicVineTalker:
         self.nam.finished.connect(self.async_fetch_alternate_cover_urls_complete)
         self.nam.get(QtNetwork.QNetworkRequest(QtCore.QUrl(str(issue_page_url))))
 
-    def async_fetch_alternate_cover_urls_complete(self, reply: QtNetwork.QNetworkReply) -> None:
+    def async_fetch_alternate_cover_urls_complete(self, reply: "QtNetwork.QNetworkReply") -> None:
         # read in the response
         html = str(reply.readAll())
         alt_cover_url_list = self.parse_out_alt_cover_urls(html)

comictaggerlib/imagefetcher.py

@@ -41,7 +41,7 @@ class ImageFetcherException(Exception):
     pass
 
 
-def fetch_complete(image_data: Union[bytes, QtCore.QByteArray]) -> None:
+def fetch_complete(image_data: "Union[bytes, QtCore.QByteArray]") -> None:
     ...
 
 
@@ -106,7 +106,7 @@ class ImageFetcher:
             # we'll get called back when done...
         return bytes()
 
-    def finish_request(self, reply: QtNetwork.QNetworkReply) -> None:
+    def finish_request(self, reply: "QtNetwork.QNetworkReply") -> None:
         # read in the image data
         logger.debug("request finished")
         image_data = reply.readAll()
@@ -134,7 +134,7 @@ class ImageFetcher:
 
             cur.execute("CREATE TABLE Images(url TEXT,filename TEXT,timestamp TEXT,PRIMARY KEY (url))")
 
-    def add_image_to_cache(self, url: str, image_data: Union[bytes, QtCore.QByteArray]) -> None:
+    def add_image_to_cache(self, url: str, image_data: "Union[bytes, QtCore.QByteArray]") -> None:
 
         con = lite.connect(self.db_file)
 

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",