From cf672b5b61e0d4120b0ca50329a844157d0b3926 Mon Sep 17 00:00:00 2001 From: mkuehbach Date: Fri, 10 Jan 2025 16:12:18 +0100 Subject: [PATCH] precommit updated --- .pre-commit-config.yaml | 2 +- dev-requirements.txt | 6 +++--- pyproject.toml | 2 +- src/pynxtools_apm/utils/create_nx_default_plots.py | 4 ++-- src/pynxtools_apm/utils/generate_synthetic_data.py | 6 +++--- src/pynxtools_apm/utils/load_ranging.py | 5 +---- 6 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 907ca72..40f632e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,7 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit # Ruff version. - rev: v0.8.0 + rev: v0.9.0 hooks: # Run the linter. - id: ruff diff --git a/dev-requirements.txt b/dev-requirements.txt index e3de8b8..87f8756 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -465,7 +465,7 @@ pyzmq==26.2.0 # jupyter-client # jupyter-console # jupyter-server -radioactivedecay==0.6.0 +radioactivedecay==0.6.1 # via ifes-apt-tc-data-modeling referencing==0.35.1 # via @@ -490,7 +490,7 @@ rpds-py==0.22.3 # via # jsonschema # referencing -ruff==0.8.6 +ruff==0.9.0 # via pynxtools-apm (pyproject.toml) scipy==1.15.0 # via @@ -600,7 +600,7 @@ wheel==0.45.1 # via pip-tools widgetsnbextension==4.0.13 # via ipywidgets -xarray==2025.1.0 +xarray==2025.1.1 # via pynxtools xmltodict==0.14.2 # via ifes-apt-tc-data-modeling diff --git a/pyproject.toml b/pyproject.toml index 6f55ea5..a873a99 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,7 @@ dependencies = [ [project.optional-dependencies] dev = [ "mypy", - "ruff>=0.6.0", + "ruff>=0.6", "pytest", "pytest-cov", "pytest-timeout", diff --git a/src/pynxtools_apm/utils/create_nx_default_plots.py b/src/pynxtools_apm/utils/create_nx_default_plots.py index cd58ebb..b942453 100644 --- a/src/pynxtools_apm/utils/create_nx_default_plots.py +++ b/src/pynxtools_apm/utils/create_nx_default_plots.py @@ -37,8 +37,8 @@ def decorate_path_to_default_plot(template: dict, nxpath: str) -> dict: symbol_s = path[idx + 1].find("[") symbol_e = path[idx + 1].find("]") if 0 <= symbol_s < symbol_e: - template[f"{trg}@default"] = f"{path[idx + 1][symbol_s + 1:symbol_e]}" - trg += f"{path[idx + 1][symbol_s + 1:symbol_e]}/" + template[f"{trg}@default"] = f"{path[idx + 1][symbol_s + 1 : symbol_e]}" + trg += f"{path[idx + 1][symbol_s + 1 : symbol_e]}/" else: template[f"{trg}@default"] = f"{path[idx + 1]}" trg += f"{path[idx + 1]}/" diff --git a/src/pynxtools_apm/utils/generate_synthetic_data.py b/src/pynxtools_apm/utils/generate_synthetic_data.py index 0e12cc9..1caa57b 100644 --- a/src/pynxtools_apm/utils/generate_synthetic_data.py +++ b/src/pynxtools_apm/utils/generate_synthetic_data.py @@ -248,9 +248,9 @@ def place_atoms_from_periodic_table(self): for idx in self.nrm_composition: accept_reject.append(idx[3]) accept_reject = np.cumsum(accept_reject) - assert ( - self.xyz != [] - ), "self.xyz must not be an empty dataset, create a geometry first!" + assert self.xyz != [], ( + "self.xyz must not be an empty dataset, create a geometry first!" + ) # print("Accept/reject sampling m/q values for " # + str(np.shape(self.xyz)[0]) + " ions") diff --git a/src/pynxtools_apm/utils/load_ranging.py b/src/pynxtools_apm/utils/load_ranging.py index eb78eb6..990169d 100644 --- a/src/pynxtools_apm/utils/load_ranging.py +++ b/src/pynxtools_apm/utils/load_ranging.py @@ -59,10 +59,7 @@ def add_unknown_iontype(template: dict, entry_id: int) -> dict: """Add default unknown iontype.""" # all unidentifiable ions are mapped on the unknown type - trg = ( - f"/ENTRY[entry{entry_id}]/atom_probe/ranging/" - f"peak_identification/ionID[ion0]/" - ) + trg = f"/ENTRY[entry{entry_id}]/atom_probe/ranging/peak_identification/ionID[ion0]/" ivec = create_nuclide_hash([]) template[f"{trg}nuclide_hash"] = np.asarray(ivec, np.uint16) template[f"{trg}charge_state"] = np.int8(0)