From 9c67f004541f0668ac35454bfb976bdbd1310993 Mon Sep 17 00:00:00 2001 From: Spencer Bryngelson Date: Thu, 26 Dec 2024 16:04:50 -0500 Subject: [PATCH] formatting examples --- .github/workflows/formatting.yml | 2 +- toolchain/bootstrap/format.sh | 9 +++++++-- toolchain/bootstrap/format_python.sh | 8 ++++++++ toolchain/pyproject.toml | 1 + 4 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 toolchain/bootstrap/format_python.sh diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml index 2a94daee0c..16043daa95 100644 --- a/.github/workflows/formatting.yml +++ b/.github/workflows/formatting.yml @@ -4,7 +4,7 @@ on: [push, pull_request, workflow_dispatch] jobs: docs: - name: Code formatting + name: Formatting runs-on: ubuntu-latest steps: diff --git a/toolchain/bootstrap/format.sh b/toolchain/bootstrap/format.sh index a2ca712489..f4baea506a 100644 --- a/toolchain/bootstrap/format.sh +++ b/toolchain/bootstrap/format.sh @@ -19,9 +19,14 @@ log "Formatting MFC:" if ! find ${@:-src} -type f | grep -Ev 'autogen' | grep -E '\.(f90|fpp)$' \ | xargs -L 1 -P ${JOBS:-1} $SHELL toolchain/bootstrap/format_file.sh; then - error "Formatting MFC failed." + error "Formatting MFC source failed." exit 1 fi -ok "Done. MFC has been formatted." +if ! find ${@:-examples} -type f | grep -E '\.(py)$' \ + | xargs -L 1 -P ${JOBS:-1} $SHELL toolchain/bootstrap/format_python.sh; then + error "Formatting MFC examples failed." + exit 1 +fi +ok "Done. MFC has been formatted." diff --git a/toolchain/bootstrap/format_python.sh b/toolchain/bootstrap/format_python.sh new file mode 100644 index 0000000000..c00213394e --- /dev/null +++ b/toolchain/bootstrap/format_python.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +. toolchain/util.sh + +echo "> $1" + +black -l 200 -x "$1" &>/dev/null 2>&1 + diff --git a/toolchain/pyproject.toml b/toolchain/pyproject.toml index a78ad7c3e3..0ede6a15c4 100644 --- a/toolchain/pyproject.toml +++ b/toolchain/pyproject.toml @@ -25,6 +25,7 @@ dependencies = [ "typos", "pylint", "fprettify", + "black", # Profiling "numpy",