From 2493da34167c5fa86a4ff3c3710027dcb2b12a1f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 May 2026 15:37:10 +0000
Subject: [PATCH 1/2] Bump ruff from 0.15.13 to 0.15.14

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.15.13 to 0.15.14.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](https://github.com/astral-sh/ruff/compare/0.15.13...0.15.14)

---
updated-dependencies:
- dependency-name: ruff
  dependency-version: 0.15.14
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 8fb496b5..54ebc666 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -67,7 +67,7 @@ doc = [
 ]
 dev = [
   "ibex_bluesky_core[doc]",
-  "ruff==0.15.13",  # Update manually so we don't get new rules 'by accident'
+  "ruff==0.15.14",  # Update manually so we don't get new rules 'by accident'
   "pyright==1.1.409",  # Update manually
   "pytest",
   "pytest-asyncio",

From 8384a6f80643d0c299db257b0d7fcabb0ba80f18 Mon Sep 17 00:00:00 2001
From: Jack Harper <jack.harper@stfc.ac.uk>
Date: Fri, 22 May 2026 09:48:58 +0100
Subject: [PATCH 2/2] add ruff ignores per-file

---
 src/ibex_bluesky_core/callbacks/_fitting.py  | 2 +-
 src/ibex_bluesky_core/run_engine/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ibex_bluesky_core/callbacks/_fitting.py b/src/ibex_bluesky_core/callbacks/_fitting.py
index 21f9e4a4..edd93ffd 100644
--- a/src/ibex_bluesky_core/callbacks/_fitting.py
+++ b/src/ibex_bluesky_core/callbacks/_fitting.py
@@ -392,7 +392,7 @@ def event(self, doc: Event) -> Event:
 
         for livefit in self._livefits:
             rem_guess = livefit.method.guess
-            try:
+            try:  # noqa: PLW0717
                 if init_guess:
                     # Use previous fit results as initial guess for next fit
                     def guess_func(
diff --git a/src/ibex_bluesky_core/run_engine/__init__.py b/src/ibex_bluesky_core/run_engine/__init__.py
index a83821b2..d8779360 100644
--- a/src/ibex_bluesky_core/run_engine/__init__.py
+++ b/src/ibex_bluesky_core/run_engine/__init__.py
@@ -178,7 +178,7 @@ def outer_plan():
             "To call a sub plan from within an outer plan, "
             "use 'yield from subplan(...)' instead.\n"
         )
-    try:
+    try:  # noqa: PLW0717
         if RE.state != "idle":
             raise RuntimeError(
                 "Cannot run plan; RunEngine is not idle at start of run_plan call. "