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 <[email protected]>
modularml · Dec 2, 2024 · fba3175 · fba3175
1 parent 5d3d450
commit fba3175
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -11,6 +11,8 @@
 # limitations under the License.
 # ===----------------------------------------------------------------------=== #
 
+# ruff: noqa
+
 import os
 import shutil
 from pathlib import Path