From 379ae8ccfb4e565cb11ffd6524463410530940ce Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sat, 19 Jul 2025 16:41:07 +0200 Subject: [PATCH 1/5] Add helper script to run tests --- run_tests.py | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100755 run_tests.py diff --git a/run_tests.py b/run_tests.py new file mode 100755 index 00000000..f72ce9c7 --- /dev/null +++ b/run_tests.py @@ -0,0 +1,36 @@ +#!/usr/bin/env python3 +"""Run novelWriter Tests.""" + +import argparse +import os +import subprocess +import sys + +if __name__ == "__main__": + """Parse command line options and run the commands.""" + parser = argparse.ArgumentParser(usage="run_tests.py [--flags]") + parser.add_argument("-o", action="store_true", help="Run off screen") + parser.add_argument("-r", action="store_true", help="Generate reports") + parser.add_argument("-t", action="store_true", help="Generate terminal report") + parser.add_argument("-m", help="Test modules") + parser.add_argument("-k", help="Test filters") + + args = parser.parse_args() + + env = os.environ.copy() + cmd = [sys.executable, "-m", "pytest", "-vv"] + + if args.o: + env["QT_QPA_PLATFORM"] = "offscreen" + if args.r or args.t: + cmd += ["--cov=novelwriter"] + if args.r: + cmd += ["--cov-report=xml", "--cov-report=html"] + if args.t: + cmd += ["--cov-report=term"] + if args.m: + cmd += ["-m", args.m] + if args.k: + cmd += ["-k", args.k] + + subprocess.call(cmd, env=env) From 9870fe448b32338debec21eb60eb321fe08cecdb Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sat, 19 Jul 2025 16:46:50 +0200 Subject: [PATCH 2/5] Add more requirements files --- requirements-all.txt | 5 +++++ setup/requirements.txt | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 requirements-all.txt create mode 100644 setup/requirements.txt diff --git a/requirements-all.txt b/requirements-all.txt new file mode 100644 index 00000000..d140ead6 --- /dev/null +++ b/requirements-all.txt @@ -0,0 +1,5 @@ +-r requirements.txt +-r requirements-dev.txt +-r docs/requirements.txt +-r setup/requirements.txt +-r tests/requirements.txt diff --git a/setup/requirements.txt b/setup/requirements.txt new file mode 100644 index 00000000..9baefa06 --- /dev/null +++ b/setup/requirements.txt @@ -0,0 +1,2 @@ +setuptools +twine From bca87429a62b9f504fb5d49c502c52c180614452 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sat, 19 Jul 2025 16:50:36 +0200 Subject: [PATCH 3/5] Update setuptools requirements --- pyproject.toml | 2 +- setup/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 3610e012..313a6fb0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools >= 77.0.3"] +requires = ["setuptools >= 77.0"] build-backend = "setuptools.build_meta" [project] diff --git a/setup/requirements.txt b/setup/requirements.txt index 9baefa06..47002255 100644 --- a/setup/requirements.txt +++ b/setup/requirements.txt @@ -1,2 +1,2 @@ -setuptools +setuptools>=77.0 twine From 3e66f47c131bc1f387c6ba65e7a56414663c821a Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sat, 19 Jul 2025 16:53:05 +0200 Subject: [PATCH 4/5] Echo the command used in the run tests script --- run_tests.py | 1 + 1 file changed, 1 insertion(+) diff --git a/run_tests.py b/run_tests.py index f72ce9c7..cedf071b 100755 --- a/run_tests.py +++ b/run_tests.py @@ -33,4 +33,5 @@ if __name__ == "__main__": if args.k: cmd += ["-k", args.k] + print("Calling:", " ".join(cmd)) subprocess.call(cmd, env=env) From df6cf331ac0c6920985896952062dc37f43e8ca1 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sat, 19 Jul 2025 16:56:41 +0200 Subject: [PATCH 5/5] Change required setuptools to 77.0.3 --- pyproject.toml | 2 +- setup/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 313a6fb0..3610e012 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools >= 77.0"] +requires = ["setuptools >= 77.0.3"] build-backend = "setuptools.build_meta" [project] diff --git a/setup/requirements.txt b/setup/requirements.txt index 47002255..120a3f4f 100644 --- a/setup/requirements.txt +++ b/setup/requirements.txt @@ -1,2 +1,2 @@ -setuptools>=77.0 +setuptools>=77.0.3 twine