From 0380a7fe720306a54b648e55aa7fe7fb45b76507 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 16 Jan 2025 21:40:20 +0100 Subject: [PATCH] Make sure the pkgutils script has no third party dependencies by default --- utils/build_binary.py | 5 +++-- utils/build_debian.py | 4 +--- utils/build_windows.py | 4 +--- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/utils/build_binary.py b/utils/build_binary.py index 37dce983..1ffa4797 100644 --- a/utils/build_binary.py +++ b/utils/build_binary.py @@ -22,11 +22,11 @@ from __future__ import annotations import argparse -import PyInstaller.__main__ - def runPyinstaller() -> None: """Run the pyinstaller.""" + import PyInstaller.__main__ + build = ["novelWriter.py", "--clean", "--windowed", "--onedir", "--noconfirm"] build += ["--name", "novelwriter"] build += ["--workpath", "build_bin"] @@ -34,6 +34,7 @@ def runPyinstaller() -> None: build += ["--hidden-import", "pyenchant"] build += ["--add-data", "novelwriter/assets:assets"] PyInstaller.__main__.run(build) + return diff --git a/utils/build_debian.py b/utils/build_debian.py index f11dea72..e993cc7b 100644 --- a/utils/build_debian.py +++ b/utils/build_debian.py @@ -29,11 +29,9 @@ import sys from utils.common import ( ROOT_DIR, SETUP_DIR, checkAssetsExist, copyPackageFiles, copySourceCode, - extractVersion, makeCheckSum, toUpload + extractVersion, makeCheckSum, toUpload, writeFile ) -from tests.tools import writeFile - SIGN_KEY = "D6A9F6B8F227CF7C6F6D1EE84DBBE4B734B0BD08" diff --git a/utils/build_windows.py b/utils/build_windows.py index 0b568c50..b3538ad2 100644 --- a/utils/build_windows.py +++ b/utils/build_windows.py @@ -30,9 +30,7 @@ import zipfile from pathlib import Path -from utils.common import ROOT_DIR, SETUP_DIR, copySourceCode, extractVersion, writeFile - -from tests.tools import readFile +from utils.common import ROOT_DIR, SETUP_DIR, copySourceCode, extractVersion, readFile, writeFile def prepareCode(outDir: Path) -> None: