Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ repos:

- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: v0.14.10
rev: v0.14.14
hooks:
- id: ruff
args: [ --fix, --exit-non-zero-on-fix ]

- repo: https://github.com/psf/black-pre-commit-mirror
rev: 25.12.0
rev: 26.1.0
hooks:
- id: black
types: [python]
Expand All @@ -48,7 +48,7 @@ repos:
- id: black-jupyter

- repo: https://github.com/kynan/nbstripout
rev: 0.8.2
rev: 0.9.0
hooks:
- id: nbstripout

Expand Down
6 changes: 2 additions & 4 deletions AFMReader/gwy.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,9 @@ def load_gwy(file_path: Path | str, channel: str) -> tuple[np.ndarray[Any, np.fl
image = image * 1e9
px_to_nm = px_to_nm * 1e9
else:
raise ValueError(
f"Units '{units}' have not been added for .gwy files. Please add \
raise ValueError(f"Units '{units}' have not been added for .gwy files. Please add \
an SI to nanometre conversion factor for these units in _gwy_read_component in \
io.py."
)
io.py.")

except FileNotFoundError:
logger.info(f"[{filename}] File not found : {file_path}")
Expand Down
4 changes: 2 additions & 2 deletions AFMReader/jpk.py
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ def _load_jpk_tags(config_path: str | Path | None = None) -> dict[str, int]:
Dictionary of JPK configuration options.
"""
if config_path is None:
config_path = resources.files(__package__) / "default_config.yaml" # type:ignore[assignment]
config = read_yaml(Path(config_path)) # type:ignore[arg-type]
config_path = resources.files(__package__) / "default_config.yaml" # type: ignore[assignment]
config = read_yaml(Path(config_path)) # type: ignore[arg-type]
logger.info(f"Configuration loaded from : {config_path}")
return config["jpk"]
Loading