From c424996143e95d4341d0d5137266d308ac68aa03 Mon Sep 17 00:00:00 2001 From: Cadair <1391051+Cadair@users.noreply.github.com> Date: Wed, 19 Aug 2026 16:57:43 +0000 Subject: [PATCH 1/6] Run cruft update from package template --- .cruft.json | 4 ++-- .pre-commit-config.yaml | 3 +++ .ruff.toml | 29 ++++++++++++++++++++++++++++- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/.cruft.json b/.cruft.json index a57e5d42..9a593a1e 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 4313e7c7..142bed32 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 ^sunkit_spex/(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 418fa32f..055674e7 100644 --- a/.ruff.toml +++ b/.ruff.toml @@ -16,6 +16,7 @@ select = [ "W", "UP", "PT", + "I", "BLE", "A", "C4", @@ -63,7 +64,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. @@ -77,6 +79,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 @@ -94,6 +97,30 @@ parametrize-names-type = "csv" [format] exclude = [ +<<<<<<< "sunkit_spex/_dev/scm_version.py", "docs/conf.py", ] +======= + +[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 = ["sunkit_spex"] +no-lines-before = ["local-folder"] + +[lint.isort.sections] +"astropy" = ["astropy", "asdf", "gwcs", "reproject"] +"sunpy" = ["sunpy"] +>>>>>>> From 3869b61f56a2e7724c89244674eaa5cdd2f1dde9 Mon Sep 17 00:00:00 2001 From: SunPyBot Date: Thu, 20 Aug 2026 06:53:34 +0000 Subject: [PATCH 2/6] Run cruft update from package template --- .cruft.json | 4 ++-- .pre-commit-config.yaml | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.cruft.json b/.cruft.json index 9a593a1e..89db9c2e 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/sunpy/package-template", - "commit": "c7bfa729646a7e17ae0e7c50c331e5c489f98fe2", + "commit": "632ed04aee0058dd88dc6b7972ca8f8061fbd6da", "checkout": null, "context": { "cookiecutter": { @@ -36,7 +36,7 @@ ".github/workflows/zizmor.yml" ], "_template": "https://github.com/sunpy/package-template", - "_commit": "c7bfa729646a7e17ae0e7c50c331e5c489f98fe2" + "_commit": "632ed04aee0058dd88dc6b7972ca8f8061fbd6da" } }, "directory": null diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 142bed32..53a263d3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -53,6 +53,12 @@ repos: args: [ "--write-changes" ] types_or: [python, rst] exclude: *exclude_dirs + - repo: https://github.com/sphinx-contrib/sphinx-lint + rev: v1.0.2 + hooks: + - id: sphinx-lint + types_or: [python, rst] + exclude: *exclude_dirs ci: autofix_prs: false autoupdate_schedule: "quarterly" From 01c177846836b270a9c2546c528fd268c7424225 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Thu, 20 Aug 2026 08:24:49 +0100 Subject: [PATCH 3/6] Update .pre-commit-config.yaml --- .pre-commit-config.yaml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 53a263d3..107ca197 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 ^sunkit_spex/(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 8ff1a85a41502e2f16eade96ea03191d3ec3de59 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Thu, 20 Aug 2026 08:25:51 +0100 Subject: [PATCH 4/6] Update .ruff.toml --- .ruff.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.ruff.toml b/.ruff.toml index 055674e7..faf4f27b 100644 --- a/.ruff.toml +++ b/.ruff.toml @@ -97,11 +97,9 @@ parametrize-names-type = "csv" [format] exclude = [ -<<<<<<< "sunkit_spex/_dev/scm_version.py", "docs/conf.py", ] -======= [lint.pydocstyle] convention = "numpy" @@ -123,4 +121,3 @@ no-lines-before = ["local-folder"] [lint.isort.sections] "astropy" = ["astropy", "asdf", "gwcs", "reproject"] "sunpy" = ["sunpy"] ->>>>>>> From 6363da65c08b80a3611e6a7a63baba63bffb0f6b Mon Sep 17 00:00:00 2001 From: Shane Maloney Date: Thu, 20 Aug 2026 09:00:13 +0100 Subject: [PATCH 5/6] Remove duplicate pydocstyle entry. Remove duplicate pydocstyle entry --- .ruff.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.ruff.toml b/.ruff.toml index faf4f27b..902d0246 100644 --- a/.ruff.toml +++ b/.ruff.toml @@ -89,9 +89,6 @@ extend-ignore = [ "PT011", # `pytest.raises(ValueError)` is too broad ] -[lint.pydocstyle] -convention = "numpy" - [lint.flake8-pytest-style] parametrize-names-type = "csv" From 6c4ad7e5090f15c27a09c349dee00e81d04d2bb5 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 20 Aug 2026 08:02:43 +0000 Subject: [PATCH 6/6] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- sunkit_spex/spectrum/spectrum.py | 4 ++-- sunkit_spex/spectrum/tests/test_spectrum.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sunkit_spex/spectrum/spectrum.py b/sunkit_spex/spectrum/spectrum.py index 839ba710..2a1a5c5d 100644 --- a/sunkit_spex/spectrum/spectrum.py +++ b/sunkit_spex/spectrum/spectrum.py @@ -2,8 +2,6 @@ from copy import deepcopy import numpy as np -from gwcs import WCS as GWCS -from gwcs import coordinate_frames as cf from ndcube import NDCube import astropy.units as u @@ -12,6 +10,8 @@ from astropy.modeling.tabular import Tabular1D from astropy.utils import lazyproperty from astropy.wcs.wcsapi import sanitize_slices +from gwcs import WCS as GWCS +from gwcs import coordinate_frames as cf __all__ = ["SpectralAxis", "Spectrum", "gwcs_from_array"] diff --git a/sunkit_spex/spectrum/tests/test_spectrum.py b/sunkit_spex/spectrum/tests/test_spectrum.py index a5e76865..54b8b012 100644 --- a/sunkit_spex/spectrum/tests/test_spectrum.py +++ b/sunkit_spex/spectrum/tests/test_spectrum.py @@ -2,7 +2,6 @@ import numpy as np import pytest -from gwcs import coordinate_frames as cf from ndcube import NDCube from ndcube.extra_coords import QuantityTableCoordinate, TimeTableCoordinate from ndcube.wcs.wrappers import CompoundLowLevelWCS @@ -14,6 +13,7 @@ from astropy.tests.helper import assert_quantity_allclose from astropy.time import Time from astropy.wcs import WCS +from gwcs import coordinate_frames as cf from sunkit_spex.spectrum.spectrum import SpectralAxis, SpectralGWCS, Spectrum, gwcs_from_array