From 520113f6a9d9b1d3d4ea698766ad6617048161f4 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2025 19:41:57 +0000 Subject: [PATCH 1/3] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.4.8 → v0.9.2](https://github.com/astral-sh/ruff-pre-commit/compare/v0.4.8...v0.9.2) - [github.com/pre-commit/pre-commit-hooks: v4.6.0 → v5.0.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.6.0...v5.0.0) --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3ee38be..fad5b42 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,7 @@ repos: # This should be before any formatting hooks like isort - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.4.8" + rev: "v0.9.2" hooks: - id: ruff args: ["--fix"] @@ -13,7 +13,7 @@ repos: - id: isort exclude: ".*(.fits|.fts|.fit|.header|.txt|tca.*|extern.*)$" - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 + rev: v5.0.0 hooks: - id: check-ast - id: check-case-conflict From c725bb8aa9f7fff852f01f23291c2a5435306a1e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2025 19:42:03 +0000 Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- chimerapy/chimera.py | 8 ++++---- chimerapy/version.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/chimerapy/chimera.py b/chimerapy/chimera.py index 8d1a828..83feb78 100644 --- a/chimerapy/chimera.py +++ b/chimerapy/chimera.py @@ -448,7 +448,7 @@ def chimera(im171, im193, im211, imhmi): props[11, ident + 1] = str(np.round(Ysb)) props[12, ident + 1] = str(eastl + "-" + westl) props[13, ident + 1] = str(width) - props[14, ident + 1] = f"{trummar / 1e+12:.1e}" + props[14, ident + 1] = f"{trummar / 1e12:.1e}" props[15, ident + 1] = str(np.round((arcar * 100 / (np.pi * (rs**2))), 1)) props[16, ident + 1] = str(np.round(mB, 1)) props[17, ident + 1] = str(np.round(mBpos, 1)) @@ -459,9 +459,9 @@ def chimera(im171, im193, im211, imhmi): props[21, ident + 1] = f"{tbpos:.1e}" tbneg = np.sum(datm[pos[:, 0], pos[:, 1]][np.where(datm[pos[:, 0], pos[:, 1]] < 0)]) props[22, ident + 1] = f"{tbneg:.1e}" - props[23, ident + 1] = f"{mB * trummar * 1e+16:.1e}" - props[24, ident + 1] = f"{mBpos * trummar * 1e+16:.1e}" - props[25, ident + 1] = f"{mBneg * trummar * 1e+16:.1e}" + props[23, ident + 1] = f"{mB * trummar * 1e16:.1e}" + props[24, ident + 1] = f"{mBpos * trummar * 1e16:.1e}" + props[25, ident + 1] = f"{mBneg * trummar * 1e16:.1e}" # =====sets up code for next possible coronal hole===== diff --git a/chimerapy/version.py b/chimerapy/version.py index 90d4111..f30630a 100644 --- a/chimerapy/version.py +++ b/chimerapy/version.py @@ -10,7 +10,7 @@ import warnings warnings.warn( - f'could not determine {__name__.split(".")[0]} package version; this indicates a broken installation' + f"could not determine {__name__.split('.')[0]} package version; this indicates a broken installation" ) del warnings From 22851a3827b98a1237977fad4d550cdabd5d9320 Mon Sep 17 00:00:00 2001 From: Shane Maloney Date: Thu, 23 Jan 2025 15:58:53 +0000 Subject: [PATCH 3/3] Test fix --- chimerapy/tests/test_chimera.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chimerapy/tests/test_chimera.py b/chimerapy/tests/test_chimera.py index e08da98..4d3053e 100644 --- a/chimerapy/tests/test_chimera.py +++ b/chimerapy/tests/test_chimera.py @@ -14,7 +14,7 @@ def test_chimera(tmp_path): - Downloader.simple_download(INPUT_FILES.values(), path=tmp_path) + _ = Downloader.simple_download(INPUT_FILES.values(), path=tmp_path) os.chdir(tmp_path) chimera_legacy()