Merge pull request #7621 from nabobalis/5.0

[5.0] CI + Release prep for 5.0.5
sunpy · May 12, 2024 · c10d2d7 · c10d2d7
2 parents ef9c3c0 + e269adf
commit c10d2d7
Show file tree

Hide file tree

Showing 18 changed files with 584 additions and 573 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,3 +1,33 @@
+5.0.5 (2024-05-11)
+==================
+
+New Features
+------------
+
+- Added a warning message for ``rsun`` mismatch in :meth:`~sunpy.map.GenericMap.reproject_to` method. (`#7370 <https://github.com/sunpy/sunpy/pull/7370>`__)
+
+
+Bug Fixes
+---------
+
+- Fixed the appearance of a double "Notes" heading in `~sunpy.map.Map` subclasses. (`#7376 <https://github.com/sunpy/sunpy/pull/7376>`__)
+- The EVE L0CS client now uses the new URLs for the data from LASP. (`#7483 <https://github.com/sunpy/sunpy/pull/7483>`__)
+- JPEG2000 files are now saved with the correct orientation. Previously they would be vertically flipped when saved. (`#7486 <https://github.com/sunpy/sunpy/pull/7486>`__)
+- Fixed a bug that interfered with :func:`astropy.wcs.utils.celestial_frame_to_wcs` when working with a custom subclass of :class:`~sunpy.coordinates.frames.SunPyBaseCoordinateFrame`. (`#7594 <https://github.com/sunpy/sunpy/pull/7594>`__)
+
+
+Documentation
+-------------
+
+- Fix a VSO doctest due to VSO now returning level one EIT data. (`#7483 <https://github.com/sunpy/sunpy/pull/7483>`__)
+
+
+Internal Changes
+----------------
+
+- Fixed an unnecessary division computation when performing a unsupported division operation using a `~sunpy.map.Map`. (`#7551 <https://github.com/sunpy/sunpy/pull/7551>`__)
+
+
 5.0.4 (2024-04-04)
 ==================
 

diff --git a/changelog/7370.feature.rst b/changelog/7370.feature.rst
diff --git a/changelog/7376.bugfix.rst b/changelog/7376.bugfix.rst
diff --git a/changelog/7483.bugfix.rst b/changelog/7483.bugfix.rst
diff --git a/changelog/7483.doc.rst b/changelog/7483.doc.rst
diff --git a/changelog/7486.bugfix.rst b/changelog/7486.bugfix.rst
diff --git a/changelog/7551.trivial.rst b/changelog/7551.trivial.rst
diff --git a/changelog/7594.bugfix.rst b/changelog/7594.bugfix.rst
diff --git a/docs/tutorial/acquiring_data/index.rst b/docs/tutorial/acquiring_data/index.rst
diff --git a/docs/tutorial/acquiring_data/jsoc.rst b/docs/tutorial/acquiring_data/jsoc.rst
diff --git a/sunpy/image/tests/test_transform.py b/sunpy/image/tests/test_transform.py
@@ -265,6 +265,7 @@ def test_reproducible_matrix_multiplication():
 
 
 @figure_test
+@skip_numpy2
 def test_clipping(rot30):
     # Generates a plot to test the clipping the output image to the range of the input image
     image = np.ones((20, 20))
@@ -297,6 +298,7 @@ def test_clipping(rot30):
 
 
 @pytest.mark.filterwarnings("ignore:.*bug in the implementation of scikit-image")
+@skip_numpy2
 @figure_test
 def test_nans(rot30):
     # Generates a plot to test the preservation and expansions of NaNs by the rotation

diff --git a/sunpy/io/special/asdf/tests/test_coordinate_frames.py b/sunpy/io/special/asdf/tests/test_coordinate_frames.py
@@ -15,6 +15,7 @@
 # Don't test the two base frames
 sunpy_frames = [frame for frame in sunpy_frames if 'base' not in frame.name]
 
+pytestmark = pytest.mark.filterwarnings("ignore")
 
 def assert_round_trip_frame(old):
     new = roundtrip_object(old)
@@ -49,9 +50,6 @@ def coordframe_array(request):
     return frame(*data, obstime='2018-01-01T00:00:00')
 
 
-# Ignore warnings thrown when trying to load the ASDF in a different
-# astropy version to that with which it was created.
-@pytest.mark.filterwarnings('ignore:.*was created with extension.*')
 @asdf_entry_points
 def test_hgc_100():
     # Test that HeliographicCarrington is populated with Earth as the

diff --git a/sunpy/io/special/asdf/tests/test_genericmap.py b/sunpy/io/special/asdf/tests/test_genericmap.py
@@ -9,6 +9,7 @@
 from sunpy.tests.helpers import asdf_entry_points
 from .helpers import roundtrip_object
 
+pytestmark = pytest.mark.filterwarnings("ignore")
 
 def assert_roundtrip_map(old):
     new = roundtrip_object(old)

diff --git a/sunpy/map/tests/test_mapbase.py b/sunpy/map/tests/test_mapbase.py
@@ -27,7 +27,7 @@
 from sunpy.image.transform import _rotation_registry
 from sunpy.map.mapbase import GenericMap
 from sunpy.map.sources import AIAMap
-from sunpy.tests.helpers import figure_test
+from sunpy.tests.helpers import figure_test, skip_numpy2
 from sunpy.time import parse_time
 from sunpy.util import SunpyUserWarning
 from sunpy.util.exceptions import SunpyMetadataWarning
@@ -1658,6 +1658,7 @@ def test_rotation_rect_pixelated_data(aia171_test_map):
 
 
 @pytest.mark.parametrize('method', _rotation_registry.keys())
+@skip_numpy2
 @figure_test
 def test_derotating_nonpurerotation_pcij(aia171_test_map, method):
     # The following map has a a PCij matrix that is not a pure rotation

diff --git a/sunpy/net/base_client.py b/sunpy/net/base_client.py
@@ -305,7 +305,7 @@ def total_size(self):
         # Find the first power of 3 below the total filesize
         power = 10**(np.floor(np.log10(total.to_value(u.byte)) // 3) * 3)
         # Create mapping from prefix value to prefix name
-        prefix_dict = {p[2]: p[0][0] for p in u.si_prefixes}
+        prefix_dict = {p[2]: p[0][0] for p in u.core.si_prefixes}
         prefix_unit = u.Unit(f'{prefix_dict[power]}byte')
         return total.to(prefix_unit).round(3)
 

diff --git a/sunpy/net/dataretriever/sources/goes.py b/sunpy/net/dataretriever/sources/goes.py
@@ -228,12 +228,12 @@ class SUVIClient(GenericClient):
     3 Results from the SUVIClient:
     Source: https://data.ngdc.noaa.gov/platforms/solar-space-observing-satellites/goes
     <BLANKLINE>
-           Start Time               End Time        Instrument ... Level Wavelength
-                                                               ...        Angstrom
-    ----------------------- ----------------------- ---------- ... ----- ----------
-    2020-07-10 00:00:00.000 2020-07-10 00:04:00.000       SUVI ...     2      304.0
-    2020-07-10 00:04:00.000 2020-07-10 00:08:00.000       SUVI ...     2      304.0
-    2020-07-10 00:08:00.000 2020-07-10 00:12:00.000       SUVI ...     2      304.0
+           Start Time               End Time        Instrument Physobs Source Provider SatelliteNumber Level Wavelength
+                                                                                                              Angstrom
+    ----------------------- ----------------------- ---------- ------- ------ -------- --------------- ----- ----------
+    2020-07-10 00:00:00.000 2020-07-10 00:04:00.000       SUVI    flux   GOES     NOAA              16     2      304.0
+    2020-07-10 00:04:00.000 2020-07-10 00:08:00.000       SUVI    flux   GOES     NOAA              16     2      304.0
+    2020-07-10 00:08:00.000 2020-07-10 00:12:00.000       SUVI    flux   GOES     NOAA              16     2      304.0
     <BLANKLINE>
     <BLANKLINE>
     """

diff --git a/sunpy/net/dataretriever/sources/norh.py b/sunpy/net/dataretriever/sources/norh.py
@@ -33,14 +33,13 @@ class NoRHClient(GenericClient):
     2 Results from the NoRHClient:
     Source: https://solar.nro.nao.ac.jp/norh/doc/manuale/node1.html
     <BLANKLINE>
-           Start Time               End Time        ... Provider Wavelength
-                                                    ...             GHz
-    ----------------------- ----------------------- ... -------- ----------
-    2016-01-01 00:00:00.000 2016-01-01 23:59:59.999 ...      NRO       17.0
-    2016-01-02 00:00:00.000 2016-01-02 23:59:59.999 ...      NRO       17.0
+           Start Time               End Time        Instrument Source Provider Wavelength
+                                                                                  GHz
+    ----------------------- ----------------------- ---------- ------ -------- ----------
+    2016-01-01 00:00:00.000 2016-01-01 23:59:59.999       NORH   NAOJ      NRO       17.0
+    2016-01-02 00:00:00.000 2016-01-02 23:59:59.999       NORH   NAOJ      NRO       17.0
     <BLANKLINE>
     <BLANKLINE>
-
     """
     baseurl = r'ftp://solar-pub.nao.ac.jp/pub/nsro/norh/data/tcx/%Y/%m/(\w){3}%y%m%d'
     pattern = '{}/tcx/{year:4d}/{month:2d}/{Wavelength:3l}{:4d}{day:2d}'

diff --git a/sunpy/util/tests/test_functools.py b/sunpy/util/tests/test_functools.py
@@ -5,8 +5,6 @@
 import unittest
 import collections
 
-import pytest
-
 from sunpy.util.functools import seconddispatch
 
 
@@ -79,7 +77,6 @@ def g(dummy, obj):
         if sys.flags.optimize < 2:
             assert g.__doc__ == "Simple test"
 
-    @pytest.mark.skipif(sys.version_info < (3, 7), reason="requires python3.7 or higher")
     def test_annotations(self):
         @seconddispatch
         def i(dummy, arg):