From ed8fa757bf56ed3ebf3ee2eb17de7a99523436d5 Mon Sep 17 00:00:00 2001 From: Cadair <1391051+Cadair@users.noreply.github.com> Date: Wed, 19 Aug 2026 16:57:39 +0000 Subject: [PATCH 1/3] Run cruft update from package template --- .cruft.json | 4 ++-- .pre-commit-config.yaml | 3 +++ .ruff.toml | 23 ++++++++++++++++++++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/.cruft.json b/.cruft.json index ebce4513..bcebf699 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/sunpy/package-template", - "commit": "2a6434a5c749ecde69d00b937a3fef27ecbad656", + "commit": "c7bfa729646a7e17ae0e7c50c331e5c489f98fe2", "checkout": null, "context": { "cookiecutter": { @@ -36,7 +36,7 @@ ".github/workflows/zizmor.yml" ], "_template": "https://github.com/sunpy/package-template", - "_commit": "2a6434a5c749ecde69d00b937a3fef27ecbad656" + "_commit": "c7bfa729646a7e17ae0e7c50c331e5c489f98fe2" } }, "directory": null diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b6d7b6c2..db1a0cfc 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,6 +8,7 @@ repos: types: [python] # Define here once and then reference using YAML anchor exclude: &exclude_dirs ^radiospectra/(data|extern)/ +<<<<<<< - id: ruff-format types: [python] exclude: *exclude_dirs @@ -17,6 +18,8 @@ repos: - id: isort types: [python] exclude: *exclude_dirs +======= +>>>>>>> - repo: https://github.com/pre-commit/pre-commit-hooks rev: v6.0.0 hooks: diff --git a/.ruff.toml b/.ruff.toml index 24020f9a..5cde84bd 100644 --- a/.ruff.toml +++ b/.ruff.toml @@ -14,6 +14,7 @@ select = [ "W", "UP", "PT", + "I", ] extend-ignore = [ # pycodestyle (E, W) @@ -40,7 +41,8 @@ extend-ignore = [ "INP001", # File is part of an implicit namespace package. ] "docs/conf.py" = [ - "E402" # Module imports not at top of file + "E402", # Module imports not at top of file + "I", # isort ] "docs/*.py" = [ "INP001", # File is part of an implicit namespace package. @@ -54,6 +56,7 @@ extend-ignore = [ "F401", # Unused import "F403", # from {name} import * used; unable to detect undefined names "F405", # {name} may be undefined, or defined from star imports + "I", # isort ] "test_*.py" = [ "E402", # Module level import not at top of cell @@ -61,3 +64,21 @@ extend-ignore = [ [lint.pydocstyle] convention = "numpy" + +[lint.isort] +default-section = "third-party" +section-order = [ + "future", + "standard-library", + "third-party", + "astropy", + "sunpy", + "first-party", + "local-folder", +] +known-first-party = ["radiospectra"] +no-lines-before = ["local-folder"] + +[lint.isort.sections] +"astropy" = ["astropy", "asdf", "gwcs", "reproject"] +"sunpy" = ["sunpy"] From 32eb369591947ddab9c7a571866e237a4082064b Mon Sep 17 00:00:00 2001 From: Shane Maloney Date: Wed, 19 Aug 2026 21:35:54 +0100 Subject: [PATCH 2/3] Remove isort hook from .pre-commit-config.yaml Removed isort hook from pre-commit configuration. --- .pre-commit-config.yaml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index db1a0cfc..38487925 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,18 +8,9 @@ repos: types: [python] # Define here once and then reference using YAML anchor exclude: &exclude_dirs ^radiospectra/(data|extern)/ -<<<<<<< - id: ruff-format types: [python] exclude: *exclude_dirs - - repo: https://github.com/PyCQA/isort - rev: 9.0.0a3 - hooks: - - id: isort - types: [python] - exclude: *exclude_dirs -======= ->>>>>>> - repo: https://github.com/pre-commit/pre-commit-hooks rev: v6.0.0 hooks: From d14ecd750c94c33e97aec91911e75524c4b48793 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 19 Aug 2026 20:39:26 +0000 Subject: [PATCH 3/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- radiospectra/spectrogram/sources/tests/test_callisto.py | 2 +- radiospectra/spectrogram/sources/tests/test_eovsa.py | 2 +- radiospectra/spectrogram/sources/tests/test_psp_rfs.py | 2 +- radiospectra/spectrogram/sources/tests/test_rstn.py | 2 +- radiospectra/spectrogram/sources/tests/test_solo_rpw.py | 2 +- radiospectra/spectrogram/sources/tests/test_swaves.py | 2 +- radiospectra/spectrogram/sources/tests/test_waves.py | 2 +- radiospectra/spectrogram/spectrogram_factory.py | 6 +++--- radiospectra/tests/helpers.py | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/radiospectra/spectrogram/sources/tests/test_callisto.py b/radiospectra/spectrogram/sources/tests/test_callisto.py index 258ec106..bd9d39e2 100644 --- a/radiospectra/spectrogram/sources/tests/test_callisto.py +++ b/radiospectra/spectrogram/sources/tests/test_callisto.py @@ -1,5 +1,5 @@ -from pathlib import Path from datetime import datetime +from pathlib import Path from unittest import mock from unittest.mock import MagicMock diff --git a/radiospectra/spectrogram/sources/tests/test_eovsa.py b/radiospectra/spectrogram/sources/tests/test_eovsa.py index 55fcb678..c0adc63f 100644 --- a/radiospectra/spectrogram/sources/tests/test_eovsa.py +++ b/radiospectra/spectrogram/sources/tests/test_eovsa.py @@ -1,5 +1,5 @@ -from pathlib import Path from datetime import datetime +from pathlib import Path from unittest import mock import numpy as np diff --git a/radiospectra/spectrogram/sources/tests/test_psp_rfs.py b/radiospectra/spectrogram/sources/tests/test_psp_rfs.py index 2fb2bbaa..7165573d 100644 --- a/radiospectra/spectrogram/sources/tests/test_psp_rfs.py +++ b/radiospectra/spectrogram/sources/tests/test_psp_rfs.py @@ -1,5 +1,5 @@ -from pathlib import Path from datetime import datetime +from pathlib import Path from unittest import mock import numpy as np diff --git a/radiospectra/spectrogram/sources/tests/test_rstn.py b/radiospectra/spectrogram/sources/tests/test_rstn.py index eb331694..3cd80691 100644 --- a/radiospectra/spectrogram/sources/tests/test_rstn.py +++ b/radiospectra/spectrogram/sources/tests/test_rstn.py @@ -1,5 +1,5 @@ -from pathlib import Path from datetime import datetime +from pathlib import Path from unittest import mock import numpy as np diff --git a/radiospectra/spectrogram/sources/tests/test_solo_rpw.py b/radiospectra/spectrogram/sources/tests/test_solo_rpw.py index d583763c..0ad08e56 100644 --- a/radiospectra/spectrogram/sources/tests/test_solo_rpw.py +++ b/radiospectra/spectrogram/sources/tests/test_solo_rpw.py @@ -1,5 +1,5 @@ -from pathlib import Path from datetime import datetime +from pathlib import Path from unittest import mock import numpy as np diff --git a/radiospectra/spectrogram/sources/tests/test_swaves.py b/radiospectra/spectrogram/sources/tests/test_swaves.py index 2880f456..63ad68c2 100644 --- a/radiospectra/spectrogram/sources/tests/test_swaves.py +++ b/radiospectra/spectrogram/sources/tests/test_swaves.py @@ -1,5 +1,5 @@ -from pathlib import Path from datetime import datetime +from pathlib import Path from unittest import mock import numpy as np diff --git a/radiospectra/spectrogram/sources/tests/test_waves.py b/radiospectra/spectrogram/sources/tests/test_waves.py index 17d8df7e..3fad077d 100644 --- a/radiospectra/spectrogram/sources/tests/test_waves.py +++ b/radiospectra/spectrogram/sources/tests/test_waves.py @@ -1,5 +1,5 @@ -from pathlib import Path from datetime import datetime +from pathlib import Path from unittest import mock import matplotlib.pyplot as plt diff --git a/radiospectra/spectrogram/spectrogram_factory.py b/radiospectra/spectrogram/spectrogram_factory.py index 4e88f0aa..d6c12bee 100644 --- a/radiospectra/spectrogram/spectrogram_factory.py +++ b/radiospectra/spectrogram/spectrogram_factory.py @@ -1,10 +1,10 @@ +import functools import gzip -import struct import pathlib +import struct import warnings -import functools -from pathlib import Path from collections import OrderedDict +from pathlib import Path from urllib.request import Request import cdflib diff --git a/radiospectra/tests/helpers.py b/radiospectra/tests/helpers.py index 39aa3a31..21c1aeb2 100644 --- a/radiospectra/tests/helpers.py +++ b/radiospectra/tests/helpers.py @@ -1,5 +1,5 @@ -from pathlib import Path from functools import wraps +from pathlib import Path import matplotlib as mpl import matplotlib.pyplot as plt