From 3120b66bfc091189c9ef3c8d89dea75a80afeb64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Sch=C3=BCtt?= Date: Mon, 29 Nov 2021 18:50:59 +0100 Subject: [PATCH] precommit: Add cmake-format --- tools/precommit/precommit.py | 3 +++ tools/precommit/precommit_server.py | 6 ++++++ tools/precommit/requirements.txt | 3 +++ 3 files changed, 12 insertions(+) diff --git a/tools/precommit/precommit.py b/tools/precommit/precommit.py index 9c339b7fa6..bf25666918 100755 --- a/tools/precommit/precommit.py +++ b/tools/precommit/precommit.py @@ -201,6 +201,9 @@ def process_file(fn, allow_modifications): if re.match(r".*\.md$", fn): run_remote_tool("markdownlint", fn) + if re.match(r"(.*/CMakeLists.txt)|(.*\.cmake)$", fn): + run_remote_tool("cmakeformat", fn) + if re.match(r"./data/.*POTENTIALS?$", fn): check_data_files() diff --git a/tools/precommit/precommit_server.py b/tools/precommit/precommit_server.py index e68f739242..0bb30c6c01 100755 --- a/tools/precommit/precommit_server.py +++ b/tools/precommit/precommit_server.py @@ -52,6 +52,12 @@ def clangformat(): return run_tool(["clang-format", "--style=llvm", "-i"]) +# ====================================================================================== +@app.route("/cmakeformat", methods=["POST"]) +def cmakeformat(): + return run_tool(["cmake-format", "-i"]) + + # ====================================================================================== def run_tool(cmd, timeout=30): assert len(request.files) == 1 diff --git a/tools/precommit/requirements.txt b/tools/precommit/requirements.txt index d4c9056915..936e585c3a 100644 --- a/tools/precommit/requirements.txt +++ b/tools/precommit/requirements.txt @@ -2,6 +2,8 @@ appdirs==1.4.4 attrs==20.1.0 black==19.10b0 click==7.1.2 +cmake-format==0.6.13 +cmakelang==0.6.13 Flask==1.1.2 gunicorn==20.0.4 itsdangerous==1.1.0 @@ -9,6 +11,7 @@ Jinja2==2.11.3 MarkupSafe==1.1.1 pathspec==0.8.0 regex==2020.7.14 +six==1.16.0 toml==0.10.1 typed-ast==1.4.1 Werkzeug==1.0.1