Update ruff

.pre-commit-config.yaml

@@ -19,7 +19,7 @@ repos:
       args: ["--drop-empty-cells",
              "--extra-keys 'metadata.language_info.version cell.metadata.jp-MarkdownHeadingCollapsed cell.metadata.pycharm'"]
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.5.7
+  rev: v0.6.1
   hooks:
     - id: ruff-format
       types_or: [ python, pyi ]

src/scitacean/testing/backend/fixtures.py

@@ -35,7 +35,7 @@ def scicat_access() -> SciCatAccess:
     return local_access("user1")
 
 
-@pytest.fixture()
+@pytest.fixture
 def fake_client(scicat_access: SciCatAccess) -> FakeClient:
     """Fixture that returns a fake client.
 
@@ -72,7 +72,7 @@ def fake_client(scicat_access: SciCatAccess) -> FakeClient:
     return client
 
 
-@pytest.fixture()
+@pytest.fixture
 def real_client(scicat_access: SciCatAccess, scicat_backend: bool) -> Client | None:
     """Fixture that returns a real client if backend tests are enabled.
 
@@ -110,7 +110,7 @@ def client(request, scicat_backend) -> Client | FakeClient:
     return request.getfixturevalue("real_client")  # type: ignore[no-any-return]
 
 
-@pytest.fixture()
+@pytest.fixture
 def require_scicat_backend(request, scicat_backend) -> None:  # noqa: PT004
     """Fixture to declare that a test needs a local scicat backend.
 

src/scitacean/testing/sftp/fixtures.py

@@ -75,7 +75,7 @@ def sftp_data_dir(sftp_base_dir: Path | None) -> Path | None:
     return sftp_base_dir / "data"
 
 
-@pytest.fixture()
+@pytest.fixture
 def require_sftp_fileserver(request, sftp_fileserver) -> None:  # noqa: PT004
     """Fixture to declare that a test needs a local SFTP server.
 

tests/client/attachment_client_test.py

@@ -21,12 +21,12 @@
 )
 
 
-@pytest.fixture()
+@pytest.fixture
 def scicat_client(client: Client) -> ScicatClient:
     return client.scicat
 
 
-@pytest.fixture()
+@pytest.fixture
 def derived_dataset(scicat_access):
     return UploadDerivedDataset(
         contactEmail="[email protected]",
@@ -43,7 +43,7 @@ def derived_dataset(scicat_access):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def attachment(scicat_access):
     return UploadAttachment(
         caption="An attachment",

tests/client/datablock_client_test.py

@@ -18,12 +18,12 @@
 )
 
 
-@pytest.fixture()
+@pytest.fixture
 def scicat_client(client: Client) -> ScicatClient:
     return client.scicat
 
 
-@pytest.fixture()
+@pytest.fixture
 def derived_dataset(scicat_access):
     return UploadDerivedDataset(
         contactEmail="[email protected]",
@@ -40,7 +40,7 @@ def derived_dataset(scicat_access):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def orig_datablock(scicat_access):
     # NOTE the placeholder!
     return UploadOrigDatablock(

tests/client/dataset_client_test.py

@@ -18,12 +18,12 @@
 )
 
 
-@pytest.fixture()
+@pytest.fixture
 def scicat_client(client: Client) -> ScicatClient:
     return client.scicat
 
 
-@pytest.fixture()
+@pytest.fixture
 def derived_dataset(scicat_access):
     return UploadDerivedDataset(
         contactEmail="[email protected]",

tests/client/sample_client_test.py

@@ -15,7 +15,7 @@
 
 
 # Creating samples requires at least ingestor permissions.
-@pytest.fixture()
+@pytest.fixture
 def ingestor_access(
     scicat_access: backend_config.SciCatAccess,
 ) -> backend_config.SciCatAccess:
@@ -25,7 +25,7 @@ def ingestor_access(
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def real_client(
     request: pytest.FixtureRequest,
     ingestor_access: backend_config.SciCatAccess,
@@ -38,12 +38,12 @@ def real_client(
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def scicat_client(client: Client) -> ScicatClient:
     return client.scicat
 
 
-@pytest.fixture()
+@pytest.fixture
 def sample(ingestor_access):
     scicat_access = ingestor_access
     return Sample(

tests/dataset_test.py

@@ -17,7 +17,7 @@
 from .common.files import make_file
 
 
-@pytest.fixture()
+@pytest.fixture
 def raw_download_model():
     return model.DownloadDataset(
         contactEmail="[email protected]",
@@ -86,7 +86,7 @@ def raw_download_model():
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def derived_download_model():
     return model.DownloadDataset(
         contactEmail="[email protected]",

tests/download_test.py

@@ -22,7 +22,7 @@ def _checksum(data: bytes) -> str:
     return checksum.hexdigest()
 
 
-@pytest.fixture()
+@pytest.fixture
 def data_files():
     contents = {
         "file1.dat": b"contents-of-file1",
@@ -41,7 +41,7 @@ def data_files():
     return files, contents
 
 
-@pytest.fixture()
+@pytest.fixture
 def dataset_and_files(data_files):
     model = DownloadDataset(
         contactEmail="[email protected]",

tests/file_test.py

@@ -16,7 +16,7 @@
 from .common.files import make_file
 
 
-@pytest.fixture()
+@pytest.fixture
 def fake_file(fs):
     return make_file(fs, path=Path("local", "dir", "events.nxs"))
 

tests/transfer/sftp_test.py

@@ -295,7 +295,7 @@ def open_sftp_client(self) -> paramiko.SFTPClient:
         return CorruptingSFTP.from_transport(self)
 
 
-@pytest.fixture()
+@pytest.fixture
 def sftp_corrupting_connect(sftp_access, sftp_connection_config):
     def connect(host: str, port: int) -> paramiko.SFTPClient:
         client = paramiko.SSHClient()
@@ -324,7 +324,7 @@ def open_sftp_client(self) -> paramiko.SFTPClient:
         return RaisingSFTP.from_transport(self)
 
 
-@pytest.fixture()
+@pytest.fixture
 def sftp_raising_connect(sftp_access):
     def connect(host: str, port: int) -> paramiko.SFTPClient:
         client = paramiko.SSHClient()

tests/upload_test.py

@@ -29,7 +29,7 @@ def get_file_transfer(client: Client) -> FakeFileTransfer:
     return client.file_transfer  # type: ignore[return-value]
 
 
-@pytest.fixture()
+@pytest.fixture
 def dataset():
     return Dataset(
         access_groups=["group1", "2nd_group"],
@@ -51,15 +51,15 @@ def dataset():
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def dataset_with_files(dataset, fs):
     make_file(fs, path="file.nxs", contents=b"contents of file.nxs")
     make_file(fs, path="the_log_file.log", contents=b"this is a log file")
     dataset.add_local_files("file.nxs", "the_log_file.log")
     return dataset
 
 
-@pytest.fixture()
+@pytest.fixture
 def attachments():
     return [
         Attachment(
@@ -75,7 +75,7 @@ def attachments():
     ]
 
 
-@pytest.fixture()
+@pytest.fixture
 def client(fs, scicat_access):
     return FakeClient.from_credentials(
         url="",