Use ruff to format python files

Author: thilinarmtb

.github/workflows/lint.yml

@@ -48,6 +48,6 @@ jobs:
         run: |
           conda env update -n libnomp-dev -f environment-dev.yml
         if: steps.cache.outputs.cache-hit != 'true'
-      - name: Run clang-format check
+      - name: Check formatting
         run: |
           ./bin/lnchk --chk-fmt

bin/lnchk

@@ -7,35 +7,23 @@ set -o pipefail
 ############################
 # Don't touch what follows #
 ############################
-
 CSRC=
-PYSRC=
-
-function setup_clang_format() {
-  if ! command -v $CLANG_FORMAT >/dev/null 2>&1; then
-    echo "Binary $CLANG_FORMAT not found!"
-    exit 1
-  fi
-
-  BINDIR=$(dirname -- "$(realpath -- "${BASH_SOURCE[0]}")")
-  SRCDIR=$BINDIR/..
-  CSRC=$(find $SRCDIR -type f -name "*.[ch]")
-}
 
-function clang_format() {
-  setup_clang_format
-  $CLANG_FORMAT -i $CSRC
-}
+if ! command -v $CLANG_FORMAT >/dev/null 2>&1; then
+  echo "Binary $CLANG_FORMAT not found!"
+  exit 1
+fi
 
-function check_clang_format() {
-  setup_clang_format
-  $CLANG_FORMAT --dry-run --Werror -i $CSRC
-}
+BINDIR=$(dirname -- "$(realpath -- "${BASH_SOURCE[0]}")")
+CSRC=$(find $BINDIR/.. -type f -name "*.[ch]")
 
 if [[ "$1" == "--fmt" ]]; then
-  clang_format
+  $CLANG_FORMAT -i $CSRC
+  ruff format .
 elif [[ "$1" == "--chk-fmt" ]]; then
-  check_clang_format
+  $CLANG_FORMAT --dry-run --Werror -i $CSRC
+  ruff format --check .
+  ruff check .
 else
   exit 1
 fi

pyproject.toml

@@ -1,15 +1,15 @@
-[tool.isort]
-multi_line_output = 3
-include_trailing_comma = true
-force_grid_wrap = 0
-use_parentheses = true
-line_length = 80
-skip_glob = ['build/*', 'docs/*']
+[tool.ruff]
+line-length = 80
+exclude = ["build", "docs"]
 
-[tool.black]
-line_length = 80
-preview = true
-exclude = 'build/|docs/'
+[tool.ruff.lint]
+# Equivalent to the old flake8 rules + isort (I = isort, E/W = pycodestyle, F = pyflakes)
+select = ["E", "F", "W", "I"]
+
+[tool.ruff.lint.isort]
+# Matches the old isort settings
+force-wrap-aliases = false
+combine-as-imports = false
 
 [tool.pylint.master]
 ignore = "build,docs"

python/loopy_api.py

@@ -22,23 +22,23 @@
 NOMP_VAR_PREFIX = "_nomp_var"
 
 _C_OPS_TO_PYMBOLIC_OPS = {
-    "*": lambda x, y: prim.Product((x, y)),
-    "+": lambda x, y: prim.Sum((x, y)),
-    "-": lambda l, r: prim.Sum((l, prim.Product((-1, r)))),
+    "*": lambda X, Y: prim.Product((X, Y)),
+    "+": lambda X, Y: prim.Sum((X, Y)),
+    "-": lambda L, R: prim.Sum((L, prim.Product((-1, R)))),
     "/": prim.Quotient,
     "//": prim.FloorDiv,
     "%": prim.Remainder,
-    "<": lambda l, r: prim.Comparison(l, "<", r),
-    "<=": lambda l, r: prim.Comparison(l, "<=", r),
-    ">": lambda l, r: prim.Comparison(l, ">", r),
-    ">=": lambda l, r: prim.Comparison(l, ">=", r),
-    "==": lambda l, r: prim.Comparison(l, "==", r),
-    "!=": lambda l, r: prim.Comparison(l, "!=", r),
-    "&&": lambda l, r: prim.LogicalAnd((l, r)),
-    "||": lambda l, r: prim.LogicalOr((l, r)),
-    "&": lambda l, r: prim.BitwiseAnd((l, r)),
-    "|": lambda l, r: prim.BitwiseOr((l, r)),
-    "^": lambda l, r: prim.BitwiseXor((l, r)),
+    "<": lambda L, R: prim.Comparison(L, "<", R),
+    "<=": lambda L, R: prim.Comparison(L, "<=", R),
+    ">": lambda L, R: prim.Comparison(L, ">", R),
+    ">=": lambda L, R: prim.Comparison(L, ">=", R),
+    "==": lambda L, R: prim.Comparison(L, "==", R),
+    "!=": lambda L, R: prim.Comparison(L, "!=", R),
+    "&&": lambda L, R: prim.LogicalAnd((L, R)),
+    "||": lambda L, R: prim.LogicalOr((L, R)),
+    "&": lambda L, R: prim.BitwiseAnd((L, R)),
+    "|": lambda L, R: prim.BitwiseOr((L, R)),
+    "^": lambda L, R: prim.BitwiseXor((L, R)),
     "<<": prim.LeftShift,
     ">>": prim.RightShift,
 }

requirements-dev.txt

@@ -1,6 +1,4 @@
-isort==5.10.1
-black==24.3.0
-flake8==4.0.1
+ruff==0.4.4
 breathe==4.34.0
 Sphinx==5.1.1
 sphinx-rtd-theme==1.0.0