diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 145310d..7edff8e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - - repo: https://github.com/myint/docformatter - rev: v1.7.5 + - repo: https://github.com/PyCQA/docformatter + rev: master hooks: - id: docformatter args: ["--in-place", "--pre-summary-newline", "--make-summary-multi"] @@ -16,7 +16,7 @@ repos: ] exclude: ".*(.fits|.fts|.fit|.txt|tca.*|extern.*|.rst|.md|docs/conf.py)$" - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: "v0.6.9" + rev: "v0.8.2" hooks: - id: ruff args: ["--fix", "--unsafe-fixes"] @@ -41,6 +41,6 @@ repos: additional_dependencies: - tomli - repo: https://github.com/rbubley/mirrors-prettier - rev: v3.3.3 + rev: v3.4.2 hooks: - id: prettier diff --git a/irispy/data/test/__init__.py b/irispy/data/test/__init__.py index 151b541..c70441d 100644 --- a/irispy/data/test/__init__.py +++ b/irispy/data/test/__init__.py @@ -8,7 +8,7 @@ import irispy -__all__ = ["rootdir", "file_list", "get_test_filepath"] +__all__ = ["file_list", "get_test_filepath", "rootdir"] rootdir = Path(irispy.__file__).parent / "data" / "test" file_list = str(Path(rootdir).glob("/*.[!p]*")) diff --git a/irispy/spectrograph.py b/irispy/spectrograph.py index b5d7f48..f73b174 100644 --- a/irispy/spectrograph.py +++ b/irispy/spectrograph.py @@ -17,7 +17,7 @@ from irispy.utils.constants import SPECTRAL_BAND from irispy.visualization import Plotter, _set_axis_colors -__all__ = ["Collection", "SpectrogramCube", "SpectrogramCubeSequence", "SGMeta"] +__all__ = ["Collection", "SGMeta", "SpectrogramCube", "SpectrogramCubeSequence"] class Collection(NDCollection): diff --git a/irispy/utils/constants.py b/irispy/utils/constants.py index 6aca7da..bf93ca6 100644 --- a/irispy/utils/constants.py +++ b/irispy/utils/constants.py @@ -5,12 +5,12 @@ import astropy.units as u __all__ = [ + "BAD_PIXEL_VALUE_SCALED", + "BAD_PIXEL_VALUE_UNSCALED", "DN_UNIT", - "READOUT_NOISE", "RADIANCE_UNIT", + "READOUT_NOISE", "SLIT_WIDTH", - "BAD_PIXEL_VALUE_SCALED", - "BAD_PIXEL_VALUE_UNSCALED", ] # The following value is only appropriate for byte scaled images diff --git a/irispy/utils/spectrograph.py b/irispy/utils/spectrograph.py index b86040f..b245949 100644 --- a/irispy/utils/spectrograph.py +++ b/irispy/utils/spectrograph.py @@ -10,9 +10,9 @@ from irispy.utils.utils import get_interpolated_effective_area __all__ = [ + "calculate_photons_per_sec_to_radiance_factor", "convert_between_DN_and_photons", "convert_or_undo_photons_per_sec_to_radiance", - "calculate_photons_per_sec_to_radiance_factor", "reshape_1D_wavelength_dimensions_for_broadcast", ] diff --git a/irispy/utils/utils.py b/irispy/utils/utils.py index 81cef41..9ba0718 100644 --- a/irispy/utils/utils.py +++ b/irispy/utils/utils.py @@ -12,12 +12,12 @@ from irispy.utils.response import get_iris_response __all__ = [ - "get_detector_type", - "get_interpolated_effective_area", "calculate_dust_mask", + "calculate_uncertainty", "gaussian1d_on_linear_bg", + "get_detector_type", + "get_interpolated_effective_area", "image_clipping", - "calculate_uncertainty", ] diff --git a/irispy/visualization.py b/irispy/visualization.py index 71ccf5c..8445f9b 100644 --- a/irispy/visualization.py +++ b/irispy/visualization.py @@ -3,7 +3,7 @@ from mpl_animators import ArrayAnimatorWCS from ndcube.visualization.mpl_plotter import MatplotlibPlotter -__all__ = ["_set_axis_colors", "Plotter", "CustomArrayAnimatorWCS"] +__all__ = ["CustomArrayAnimatorWCS", "Plotter", "_set_axis_colors"] def _set_axis_colors(ax): diff --git a/pyproject.toml b/pyproject.toml index 5924444..c8f25f0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,7 @@ classifiers = [ ] dependencies = [ 'dkist>=1.0.0', - 'ndcube>=2.2.3', + 'ndcube @ git+https://github.com/sunpy/ndcube@YOLO', 'pandas>=1.3.3', 'scipy>=1.7.0', 'sunpy>=6.0.0',