Merge pull request #7618 from nabobalis/ci

Fix CI a bit more
sunpy · May 11, 2024 · d61e76e · d61e76e
2 parents c3e85b2 + 589b6de
commit d61e76e
Show file tree

Hide file tree

Showing 7 changed files with 552 additions and 561 deletions.
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/pytest.ini b/pytest.ini
@@ -28,6 +28,7 @@ addopts =
     --dist no
     --arraydiff
     --doctest-ignore-import-errors
+    --doctest-continue-on-failure
 asdf_schema_tests_enabled = true
 asdf_schema_root = sunpy/io/special/asdf/resources/
 mpl-results-path = figure_test_images

diff --git a/sunpy/map/tests/test_mapbase_dask.py b/sunpy/map/tests/test_mapbase_dask.py
@@ -24,8 +24,9 @@ def aia171_test_dask_map(aia171_test_map):
 
 def test_dask_array_repr(aia171_test_dask_map):
     # Check that _repr_html_ functions for a dask array
-    html_dask_repr = aia171_test_dask_map._repr_html_(compute_dask=False)
-    html_computed_repr = aia171_test_dask_map._repr_html_(compute_dask=True)
+    with np.errstate(divide='ignore'):
+        html_dask_repr = aia171_test_dask_map._repr_html_(compute_dask=False)
+        html_computed_repr = aia171_test_dask_map._repr_html_(compute_dask=True)
     assert html_dask_repr != html_computed_repr
 
 

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}'