diff --git a/.cruft.json b/.cruft.json index ebce451..bcebf69 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 b6d7b6c..3848792 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -11,12 +11,6 @@ repos: - 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: diff --git a/.ruff.toml b/.ruff.toml index 24020f9..5cde84b 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"] diff --git a/radiospectra/spectrogram/sources/tests/test_callisto.py b/radiospectra/spectrogram/sources/tests/test_callisto.py index 258ec10..bd9d39e 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 55fcb67..c0adc63 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 2fb2bba..7165573 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 eb33169..3cd8069 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 d583763..0ad08e5 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 2880f45..63ad68c 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 17d8df7..3fad077 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 4e88f0a..d6c12be 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 39aa3a3..21c1aeb 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