feat(builder): call tldextract in build scripts

Author: jmkerloch

.github/workflows/build_release.yml

@@ -92,9 +92,6 @@ jobs:
       - name: Install project as a package
         run: python -m pip install -e .
 
-      - name: Generates tldextract cache
-        run: python -O ./builder/tldextract_update.py
-
       - name: Generates Executable
         run: python -O ./builder/pyinstaller_build_macos.py
 
@@ -129,8 +126,6 @@ jobs:
 
       - name: Install project as a package
         run: python -m pip install -e .
-      - name: Generates tldextract cache
-        run: python -O ./builder/tldextract_update.py
 
       - name: Generates Executable
         run: python -O ./builder/pyinstaller_build_ubuntu.py
@@ -170,9 +165,6 @@ jobs:
       - name: Generates MS Version Info
         run: python .\builder\version_info_templater.py
 
-      - name: Generates tldextract cache
-        run: python -O .\builder\tldextract_update.py
-
       - name: Generates MS Executable
         run: python -O .\builder\pyinstaller_build_windows.py
 

builder/pyinstaller_build_macos.py

@@ -20,6 +20,7 @@
 
 # package
 sys.path.insert(0, str(Path(".").resolve()))
+from builder import tldextract_update
 from qgis_deployment_toolbelt import __about__  # noqa: E402
 
 # #############################################################################
@@ -49,6 +50,8 @@
 mac_os_version, _, _ = platform.mac_ver()
 mac_os_version = "-".join(mac_os_version.split(".")[:2])
 
+tldextract_update.run()
+
 PyInstaller.__main__.run(
     [
         "--add-data=LICENSE:.",

builder/pyinstaller_build_ubuntu.py

@@ -21,6 +21,7 @@
 
 # package
 sys.path.insert(0, str(Path(".").resolve()))
+from builder import tldextract_update
 from qgis_deployment_toolbelt import __about__  # noqa: E402
 
 # #############################################################################
@@ -48,6 +49,8 @@
 )
 package_folder = Path("qgis_deployment_toolbelt")
 
+tldextract_update.run()
+
 PyInstaller.__main__.run(
     [
         "--add-data=LICENSE:.",

builder/pyinstaller_build_windows.py

@@ -20,6 +20,7 @@
 
 # package
 sys.path.insert(0, str(Path(".").resolve()))
+from builder import tldextract_update
 from qgis_deployment_toolbelt import __about__  # noqa: E402
 
 # #############################################################################
@@ -46,6 +47,8 @@
 )
 package_folder = Path("qgis_deployment_toolbelt")
 
+tldextract_update.run()
+
 PyInstaller.__main__.run(
     [
         "--add-data=LICENSE:.",

builder/tldextract_update.py

@@ -11,17 +11,13 @@
 
 # Standard library
 import argparse
-import sys
 import urllib.request
-from os import W_OK, access, path
+from os import W_OK, access
 from pathlib import Path
 
 # 3rd party
 from tldextract import TLDExtract
 
-sys.path.insert(0, path.abspath(r"."))
-
-
 # #############################################################################
 # ########### MAIN #################
 # ##################################

docs/development/packaging.md

@@ -14,9 +14,6 @@ The output binary and all embedded dependencies is located into a subfolder name
 # Generates MS Version Info
 python .\builder\version_info_templater.py
 
-# Generates tldextract cache
-python .\builder\tldextract_update.py
-
 # Generates MS Executable
 python -O .\builder\pyinstaller_build_windows.py
 ```
@@ -32,8 +29,6 @@ To run it, double-click on the executable file (*.exe) loated into `dist` folder
 ```sh
 # Generates binary executable
 python -O ./builder/pyinstaller_build_ubuntu.py
-# Generates tldextract cache
-python ./builder/tldextract_update.py
 # make it runnable
 chmod +x dist/QGISDeploymentToolbelt_*
 ```