diff --git a/.github/workflows/valgrind-analysis.yml b/.github/workflows/valgrind-analysis.yml index b79a35cf3..5c52e11f8 100644 --- a/.github/workflows/valgrind-analysis.yml +++ b/.github/workflows/valgrind-analysis.yml @@ -17,7 +17,7 @@ jobs: valgrind-analysis: runs-on: ubuntu-latest container: symless/synergy-core:ubuntu-22.04-amd64 - timeout-minutes: 5 + timeout-minutes: 10 steps: - name: Checkout diff --git a/.gitignore b/.gitignore index 56067f54d..72ceca0cb 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ Brewfile.lock.json .DS_Store *.code-workspace .env* +/scripts/*.egg-info diff --git a/ChangeLog b/ChangeLog index 49dff1d9f..15b5181ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,6 +56,7 @@ Enhancements: - #7401 Run Valgrind on unit tests in CI to detect memory leaks - #7403 Solve low hanging reliability and maintainability issues - #7404 Restore integtests and add to CI as warning comment on failure +- #7406 Migrate scripts from `requirements.txt` to `pyproject.toml` # 1.14.6 diff --git a/scripts/lib/env.py b/scripts/lib/env.py index c037b6ace..4f4883fc5 100644 --- a/scripts/lib/env.py +++ b/scripts/lib/env.py @@ -134,7 +134,7 @@ def install_requirements(): print("Installing required modules...") cmd_utils.run( - [sys.executable, "-m", "pip", "install", "-r", "scripts/requirements.txt"], + [sys.executable, "-m", "pip", "install", "-e", "scripts"], shell=False, print_cmd=True, ) diff --git a/scripts/pyproject.toml b/scripts/pyproject.toml new file mode 100644 index 000000000..092d65aad --- /dev/null +++ b/scripts/pyproject.toml @@ -0,0 +1,14 @@ +[project] +name = "scripts" +version = "0.0.1" +description = "Scripts to assist with development of Synergy" +requires-python = ">=3.9" +dependencies = [ + "cmake_format", + "clang-format", + "python-dotenv", + "pyyaml", + "dmgbuild; sys_platform == 'darwin'", + "aqtinstall; sys_platform == 'win32' or sys_platform == 'darwin'", + "colorama", +] diff --git a/scripts/requirements.txt b/scripts/requirements.txt deleted file mode 100644 index fd3917844..000000000 --- a/scripts/requirements.txt +++ /dev/null @@ -1,7 +0,0 @@ -cmake_format -clang-format -python-dotenv -pyyaml -dmgbuild; sys_platform == 'darwin' -aqtinstall; sys_platform == 'win32' or sys_platform == 'darwin' -colorama