From fba3175a59d3e47180748b8282ae4a78ba8b4222 Mon Sep 17 00:00:00 2001
From: Keith Smiley <keithbsmiley@gmail.com>
Date: Mon, 2 Dec 2024 10:04:29 -0800
Subject: [PATCH] Format python with ruff

Ruff is a faster and more modern python formatter. This swaps out using
`mojo format` for python with ruff.

Signed-off-by: Keith Smiley <keithbsmiley@gmail.com>
---
 .pre-commit-config.yaml      | 8 +++++++-
 examples/check_mod.py        | 2 +-
 examples/lit.cfg.py          | 8 +++++---
 examples/pymatmul.py         | 2 +-
 examples/simple_interop.py   | 2 +-
 stdlib/benchmarks/lit.cfg.py | 2 ++
 stdlib/test/lit.cfg.py       | 2 ++
 7 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9ca3f26be6..607e1b0516 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -5,7 +5,7 @@ repos:
         name: mojo-format
         entry: mojo format
         language: system
-        files: '\.(mojo|🔥|py)$'
+        files: '\.(mojo|🔥)$'
         stages: [commit]
       - id: check-docstrings
         name: check-docstrings
@@ -24,3 +24,9 @@ repos:
     hooks:
     - id: markdownlint
       args: ['--config', 'stdlib/scripts/.markdownlint.yaml', '--fix']
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.8.0
+    hooks:
+      - id: ruff
+        args: [--fix]
+      - id: ruff-format
diff --git a/examples/check_mod.py b/examples/check_mod.py
index 26e99dc419..21a676d708 100644
--- a/examples/check_mod.py
+++ b/examples/check_mod.py
@@ -37,5 +37,5 @@ def install_if_missing(name: str):
             raise ImportError("python not on path" + FIX)
         subprocess.check_call([python, "-m", "pip", "install", name])
         return
-    except:
+    except subprocess.CalledProcessError:
         raise ImportError(f"{name} not found" + FIX)
diff --git a/examples/lit.cfg.py b/examples/lit.cfg.py
index 1c3516870d..4795ce09e2 100644
--- a/examples/lit.cfg.py
+++ b/examples/lit.cfg.py
@@ -11,6 +11,8 @@
 # limitations under the License.
 # ===----------------------------------------------------------------------=== #
 
+# ruff: noqa
+
 import os
 from pathlib import Path
 
@@ -55,9 +57,9 @@
     / "mojo",
 )
 
-os.environ[
-    "MODULAR_MOJO_NIGHTLY_IMPORT_PATH"
-] = f"{build_root},{pre_built_packages_path}"
+os.environ["MODULAR_MOJO_NIGHTLY_IMPORT_PATH"] = (
+    f"{build_root},{pre_built_packages_path}"
+)
 
 # Pass through several environment variables
 # to the underlying subprocesses that run the tests.
diff --git a/examples/pymatmul.py b/examples/pymatmul.py
index 5116cc289c..ab47f0c942 100644
--- a/examples/pymatmul.py
+++ b/examples/pymatmul.py
@@ -17,7 +17,7 @@
 import check_mod
 
 check_mod.install_if_missing("numpy")
-import numpy as np
+import numpy as np  # noqa
 
 
 class PyMatrix:
diff --git a/examples/simple_interop.py b/examples/simple_interop.py
index e012454617..c7c29694f0 100644
--- a/examples/simple_interop.py
+++ b/examples/simple_interop.py
@@ -18,7 +18,7 @@
 import check_mod
 
 check_mod.install_if_missing("numpy")
-import numpy as np
+import numpy as np  # noqa
 
 
 def test_interop_func():
diff --git a/stdlib/benchmarks/lit.cfg.py b/stdlib/benchmarks/lit.cfg.py
index a06446ab34..834c5f62c6 100644
--- a/stdlib/benchmarks/lit.cfg.py
+++ b/stdlib/benchmarks/lit.cfg.py
@@ -11,6 +11,8 @@
 # limitations under the License.
 # ===----------------------------------------------------------------------=== #
 
+# ruff: noqa
+
 import os
 from pathlib import Path
 
diff --git a/stdlib/test/lit.cfg.py b/stdlib/test/lit.cfg.py
index 55976ecfe6..5dee80545d 100644
--- a/stdlib/test/lit.cfg.py
+++ b/stdlib/test/lit.cfg.py
@@ -11,6 +11,8 @@
 # limitations under the License.
 # ===----------------------------------------------------------------------=== #
 
+# ruff: noqa
+
 import os
 import shutil
 from pathlib import Path