Merge branch 'main' into cruft_ruff

sunpy · Oct 31, 2024 · 409c97b · 409c97b
2 parents 809fd89 + d89c36a
commit 409c97b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -53,7 +53,7 @@
 automodapi_toctreedirnm = "generated/api"
 
 # Add any paths that contain templates here, relative to this directory.
-# templates_path = ["_templates"]
+# templates_path = ["_templates"]  # NOQA: ERA001
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
@@ -103,7 +103,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-# html_static_path = ["_static"]
+# html_static_path = ["_static"]  # NOQA: ERA001
 
 # By default, when rendering docstrings for classes, sphinx.ext.autodoc will
 # make docs with the class-level docstring and the class-method docstrings,

diff --git a/sunraster/instr/tests/test_spice.py b/sunraster/instr/tests/test_spice.py
@@ -216,11 +216,11 @@ def test_meta_observing_mode_id_solar_orbiter(spice_meta):
 
 
 def test_meta_darkmap_subtracted_onboard(spice_meta):
-    assert spice_meta.darkmap_subtracted_onboard == False
+    assert spice_meta.darkmap_subtracted_onboard is False
 
 
 def test_meta_bias_frame_subtracted_onboard(spice_meta):
-    assert spice_meta.bias_frame_subtracted_onboard == False
+    assert spice_meta.bias_frame_subtracted_onboard is False
 
 
 def test_meta_window_type(spice_meta):

diff --git a/sunraster/spectrogram_sequence.py b/sunraster/spectrogram_sequence.py
@@ -270,7 +270,7 @@ def _set_single_scan_instrument_axes_types(self):
             if len(spectral_raster_index) == 1:
                 self._single_scan_instrument_axes_types[spectral_raster_index] = self._spectral_axis_name
             # Slit axis name.
-            w = self._single_scan_instrument_axes_types == None
+            w = self._single_scan_instrument_axes_types is None
             if w.sum() > 1:
                 raise ValueError(
                     "Unable to parse the WCS or common_axis to work out either or both the slit-step axis nor the spectral (aka the slit) axis."

diff --git a/sunraster/tests/test_spectrogram.py b/sunraster/tests/test_spectrogram.py
@@ -176,7 +176,7 @@ def test_exposure_time_error():
 
 
 @pytest.mark.parametrize(
-    "input_cube, undo, force, expected_cube",
+    ("input_cube", "undo", "force", "expected_cube"),
     [
         (spectrogram_DN0, False, False, spectrogram_DN_per_s0),
         (spectrogram_DN_per_s0, True, False, spectrogram_DN0),
@@ -200,7 +200,7 @@ def test_uncalculate_exposure_time_correction_error():
 
 
 @pytest.mark.parametrize(
-    "item,expected",
+    ("item", "expected"),
     [
         (0, np.array(["b", "c"])),
         (slice(0, 1), np.array(["a", "b", "c"])),

diff --git a/sunraster/tests/test_spectrogramsequence.py b/sunraster/tests/test_spectrogramsequence.py
@@ -244,7 +244,7 @@ def test_exposure_time():
 
 
 @pytest.mark.parametrize(
-    "input_sequence, undo, force, expected_sequence",
+    ("input_sequence", "undo", "force", "expected_sequence"),
     [
         (sequence_DN, False, False, sequence_DN_per_s),
         (sequence_DN_per_s, True, False, sequence_DN),
@@ -258,7 +258,7 @@ def test_apply_exposure_time_correction(input_sequence, undo, force, expected_se
 
 
 @pytest.mark.parametrize(
-    "input_sequence, expected_raster_axes_types",
+    ("input_sequence", "expected_raster_axes_types"),
     [
         (
             sequence_DN0,
@@ -305,7 +305,7 @@ def test_raster_instrument_axes_types(input_sequence, expected_raster_axes_types
 
 
 @pytest.mark.parametrize(
-    "input_sequence, expected_sns_axes_types",
+    ("input_sequence", "expected_sns_axes_types"),
     [
         (
             sequence_DN0,