Skip to content

Commit

Permalink
More ruff fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
thomashopkins32 committed Dec 27, 2024
1 parent bbe5d34 commit a0cf9f5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
5 changes: 2 additions & 3 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
)
from ophyd_async.epics import adsimdetector


PANDA_RECORD = str(Path(__file__).parent / "fastcs" / "panda" / "db" / "panda.db")
INCOMPLETE_BLOCK_RECORD = str(
Path(__file__).parent / "fastcs" / "panda" / "db" / "incomplete_block_panda.db"
Expand Down Expand Up @@ -260,9 +259,9 @@ async def sim_detector(request: FixtureRequest):
tmp_path (Path): Temporary directory for file writing
"""
prefix = (
request.param[0] if isinstance(request.param, (list, tuple)) else request.param
request.param[0] if isinstance(request.param, list | tuple) else request.param
)
name = request.param[1] if isinstance(request.param, (list, tuple)) else "test"
name = request.param[1] if isinstance(request.param, list | tuple) else "test"
tmp_path = request.getfixturevalue("tmp_path")

fp = StaticFilenameProvider(f"test-{new_uid()}")
Expand Down
3 changes: 2 additions & 1 deletion tests/core/test_protocol.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import pytest
from pathlib import Path

import pytest

from ophyd_async.core import (
AsyncReadable,
StandardFlyer,
Expand Down

0 comments on commit a0cf9f5

Please sign in to comment.