diff --git a/onnxscript/onnx_opset/_impl/opset1.py b/onnxscript/onnx_opset/_impl/opset1.py
index 4af313184d..b9e71d49c7 100644
--- a/onnxscript/onnx_opset/_impl/opset1.py
+++ b/onnxscript/onnx_opset/_impl/opset1.py
@@ -7,7 +7,7 @@
 # --------------------------------------------------------------------------
 # pylint: disable=W0221,W0222,R0901,W0237
 # mypy: disable-error-code=override
-# ruff: noqa: D214, D402, D405, D411, D416, D417
+# ruff: noqa: D402, D411, D417
 # --------------------------------------------------------------------------
 
 from __future__ import annotations
@@ -2026,7 +2026,7 @@ def Loop(
               %keepgoing = Constant[value = <Scalar Tensor [1]>]()
               %max_trip_count = Constant[value = <Scalar Tensor [10]>]()
               %keepgoing_out, %b_out, %user_defined_vals = Loop[body = <graph body-net>](%max_trip_count, %keepgoing, %b)
-              return
+              return  // end of graph
             }
 
             graph body-net (
diff --git a/onnxscript/onnx_opset/_impl/opset11.py b/onnxscript/onnx_opset/_impl/opset11.py
index 6538ac3afb..f71eae650e 100644
--- a/onnxscript/onnx_opset/_impl/opset11.py
+++ b/onnxscript/onnx_opset/_impl/opset11.py
@@ -7,7 +7,7 @@
 # --------------------------------------------------------------------------
 # pylint: disable=W0221,W0222,R0901,W0237
 # mypy: disable-error-code=override
-# ruff: noqa: E741, D214, D402, D405, D411, D416
+# ruff: noqa: E741, D402
 # --------------------------------------------------------------------------
 
 from __future__ import annotations
@@ -1528,7 +1528,7 @@ def Loop(
               %keepgoing = Constant[value = <Scalar Tensor [1]>]()
               %max_trip_count = Constant[value = <Scalar Tensor [10]>]()
               %keepgoing_out, %b_out, %user_defined_vals = Loop[body = <graph body-net>](%max_trip_count, %keepgoing, %b)
-              return
+              return  // end of graph
             }
 
             graph body-net (
diff --git a/onnxscript/onnx_opset/_impl/opset13.py b/onnxscript/onnx_opset/_impl/opset13.py
index 5403df22cf..970bd050ac 100644
--- a/onnxscript/onnx_opset/_impl/opset13.py
+++ b/onnxscript/onnx_opset/_impl/opset13.py
@@ -7,7 +7,7 @@
 # --------------------------------------------------------------------------
 # pylint: disable=W0221,W0222,R0901,W0237
 # mypy: disable-error-code=override
-# ruff: noqa: D214, D402, D405, D411, D416, D417
+# ruff: noqa: D402, D417
 # --------------------------------------------------------------------------
 
 from __future__ import annotations
@@ -1683,7 +1683,7 @@ def Loop(
               %keepgoing = Constant[value = <Scalar Tensor [1]>]()
               %max_trip_count = Constant[value = <Scalar Tensor [10]>]()
               %keepgoing_out, %b_out, %user_defined_vals = Loop[body = <graph body-net>](%max_trip_count, %keepgoing, %b)
-              return
+              return  // end of graph
             }
 
             graph body-net (
diff --git a/onnxscript/onnx_opset/_impl/opset16.py b/onnxscript/onnx_opset/_impl/opset16.py
index 21a92a6026..c1d9aea5cf 100644
--- a/onnxscript/onnx_opset/_impl/opset16.py
+++ b/onnxscript/onnx_opset/_impl/opset16.py
@@ -7,7 +7,7 @@
 # --------------------------------------------------------------------------
 # pylint: disable=W0221,W0222,R0901,W0237
 # mypy: disable-error-code=override
-# ruff: noqa: D214, D402, D405, D411, D416
+# ruff: noqa: D402
 # --------------------------------------------------------------------------
 
 from __future__ import annotations
@@ -508,7 +508,7 @@ def Loop(
               %keepgoing = Constant[value = <Scalar Tensor [1]>]()
               %max_trip_count = Constant[value = <Scalar Tensor [10]>]()
               %keepgoing_out, %b_out, %user_defined_vals = Loop[body = <graph body-net>](%max_trip_count, %keepgoing, %b)
-              return
+              return  // end of graph
             }
 
             graph body-net (
diff --git a/onnxscript/onnx_opset/_impl/opset19.py b/onnxscript/onnx_opset/_impl/opset19.py
index 18a7cba17a..2ff072d49b 100644
--- a/onnxscript/onnx_opset/_impl/opset19.py
+++ b/onnxscript/onnx_opset/_impl/opset19.py
@@ -7,7 +7,7 @@
 # --------------------------------------------------------------------------
 # pylint: disable=W0221,W0222,R0901,W0237
 # mypy: disable-error-code=override
-# ruff: noqa: D214, D402, D405, D411, D412, D416
+# ruff: noqa: D402, D412
 # --------------------------------------------------------------------------
 
 from __future__ import annotations
@@ -920,7 +920,7 @@ def Loop(
               %keepgoing = Constant[value = <Scalar Tensor [1]>]()
               %max_trip_count = Constant[value = <Scalar Tensor [10]>]()
               %keepgoing_out, %b_out, %user_defined_vals = Loop[body = <graph body-net>](%max_trip_count, %keepgoing, %b)
-              return
+              return  // end of graph
             }
 
             graph body-net (
diff --git a/onnxscript/onnx_opset/_impl/opset21.py b/onnxscript/onnx_opset/_impl/opset21.py
index b0ae5a2e9c..f0919ed570 100644
--- a/onnxscript/onnx_opset/_impl/opset21.py
+++ b/onnxscript/onnx_opset/_impl/opset21.py
@@ -7,7 +7,7 @@
 # --------------------------------------------------------------------------
 # pylint: disable=W0221,W0222,R0901,W0237
 # mypy: disable-error-code=override
-# ruff: noqa: D214, D402, D405, D411, D412, D416
+# ruff: noqa: D402, D412
 # --------------------------------------------------------------------------
 
 from __future__ import annotations
@@ -897,7 +897,7 @@ def Loop(
               %keepgoing = Constant[value = <Scalar Tensor [1]>]()
               %max_trip_count = Constant[value = <Scalar Tensor [10]>]()
               %keepgoing_out, %b_out, %user_defined_vals = Loop[body = <graph body-net>](%max_trip_count, %keepgoing, %b)
-              return
+              return  // end of graph
             }
 
             graph body-net (
diff --git a/onnxscript/onnx_opset/_impl/opset23.py b/onnxscript/onnx_opset/_impl/opset23.py
index 73b7480073..a69f69ca17 100644
--- a/onnxscript/onnx_opset/_impl/opset23.py
+++ b/onnxscript/onnx_opset/_impl/opset23.py
@@ -7,7 +7,7 @@
 # --------------------------------------------------------------------------
 # pylint: disable=W0221,W0222,R0901,W0237
 # mypy: disable-error-code=override
-# ruff: noqa: D214, D402, D405, D411, D412, D416
+# ruff: noqa: D402, D412
 # --------------------------------------------------------------------------
 
 from __future__ import annotations
@@ -1009,7 +1009,7 @@ def Loop(
               %keepgoing = Constant[value = <Scalar Tensor [1]>]()
               %max_trip_count = Constant[value = <Scalar Tensor [10]>]()
               %keepgoing_out, %b_out, %user_defined_vals = Loop[body = <graph body-net>](%max_trip_count, %keepgoing, %b)
-              return
+              return  // end of graph
             }
 
             graph body-net (
diff --git a/onnxscript/onnx_opset/_impl/opset24.py b/onnxscript/onnx_opset/_impl/opset24.py
index d85fcaefe5..b9e58a57c6 100644
--- a/onnxscript/onnx_opset/_impl/opset24.py
+++ b/onnxscript/onnx_opset/_impl/opset24.py
@@ -7,7 +7,7 @@
 # --------------------------------------------------------------------------
 # pylint: disable=W0221,W0222,R0901,W0237
 # mypy: disable-error-code=override
-# ruff: noqa: D214, D402, D405, D411, D412, D416
+# ruff: noqa: D402, D412
 # --------------------------------------------------------------------------
 
 from __future__ import annotations
@@ -1091,7 +1091,7 @@ def Loop(
               %keepgoing = Constant[value = <Scalar Tensor [1]>]()
               %max_trip_count = Constant[value = <Scalar Tensor [10]>]()
               %keepgoing_out, %b_out, %user_defined_vals = Loop[body = <graph body-net>](%max_trip_count, %keepgoing, %b)
-              return
+              return  // end of graph
             }
 
             graph body-net (
diff --git a/requirements/lintrunner/requirements.txt b/requirements/lintrunner/requirements.txt
index a8f3355ada..96b1eb9b40 100644
--- a/requirements/lintrunner/requirements.txt
+++ b/requirements/lintrunner/requirements.txt
@@ -1,7 +1,7 @@
 # This file is auto updated by dependabot
 lintrunner-adapters>=0.8.0
 # RUFF, RUFF-FIX
-ruff==0.15.1
+ruff==0.15.8
 # MYPY
 mypy==1.10.1
 types-PyYAML==6.0.12.20250915