Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport PR #6929 on branch 4.0 (GOES version 2.2 data update) #6930

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions sunpy/map/tests/test_map_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,8 @@ def test_map_list_urls_cache():
"""
Test for https://github.com/sunpy/sunpy/issues/4006
"""
urls = ['http://jsoc.stanford.edu/SUM80/D136597189/S00000/image_lev1.fits',
'http://jsoc.stanford.edu/SUM79/D136597240/S00000/image_lev1.fits']
urls = ['https://github.com/sunpy/data/raw/main/sunpy/v1/AIA20110607_063305_0094_lowres.fits',
'https://github.com/sunpy/data/raw/main/sunpy/v1/AIA20110607_063305_0094_lowres.fits']
sunpy.map.Map(urls)


Expand Down
2 changes: 1 addition & 1 deletion sunpy/net/dataretriever/sources/tests/test_goes_ud.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def LCClient():
'https://www.ncei.noaa.gov/data/goes-space-environment-monitor/access/science/xrs/goes10/gxrs-l2-irrad_science/2008/06/sci_gxrs-l2-irrad_g10_d20080604_v0-0-0.nc'),
(Time('2020/08/02', '2020/08/04'),
'https://data.ngdc.noaa.gov/platforms/solar-space-observing-satellites/goes/'
'goes16/l2/data/xrsf-l2-flx1s_science/2020/08/sci_xrsf-l2-flx1s_g16_d20200802_v2-1-0.nc',
'goes16/l2/data/xrsf-l2-flx1s_science/2020/08/sci_xrsf-l2-flx1s_g16_d20200802_v2-2-0.nc',
'https://data.ngdc.noaa.gov/platforms/solar-space-observing-satellites/goes/'
'goes17/l2/data/xrsf-l2-flx1s_science/2020/08/sci_xrsf-l2-flx1s_g17_d20200804_v2-1-0.nc')])
def test_get_url_for_time_range(LCClient, timerange, url_start, url_end):
Expand Down
4 changes: 2 additions & 2 deletions sunpy/net/helio/hec.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ def search(self, *args, **kwargs):
>>> from sunpy.net import attrs as a, Fido
>>> timerange = a.Time('2005/01/03', '2005/12/03')
>>> res = Fido.search(timerange, ha.MaxRecords(10),
... ha.TableName('rhessi_hxr_flare')) # doctest: +REMOTE_DATA
>>> res #doctest: +REMOTE_DATA
... ha.TableName('rhessi_hxr_flare')) # doctest: +SKIP
>>> res # doctest: +SKIP
<sunpy.net.fido_factory.UnifiedResponse object at ...>
Results from 1 Provider:
<BLANKLINE>
Expand Down
12 changes: 6 additions & 6 deletions sunpy/net/helio/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def webservice_parser(service='HEC'):
Examples
--------
>>> from sunpy.net.helio import parser
>>> parser.webservice_parser() # doctest: +REMOTE_DATA
>>> parser.webservice_parser() # doctest: +SKIP
['http://helio.mssl.ucl.ac.uk/helio-hec/HelioService',
'http://msslkk.mssl.ucl.ac.uk/helio-hec/HelioService',
'http://voparis-helio.obspm.fr/helio-hec/HelioService',
Expand Down Expand Up @@ -94,7 +94,7 @@ def endpoint_parser(link):
Examples
--------
>>> from sunpy.net.helio import parser
>>> parser.endpoint_parser('http://msslkz.mssl.ucl.ac.uk/helio-hec/HelioService') # doctest: +REMOTE_DATA
>>> parser.endpoint_parser('http://msslkz.mssl.ucl.ac.uk/helio-hec/HelioService') # doctest: +SKIP
['http://helio.mssl.ucl.ac.uk/helio-hec/HelioService?wsdl',
'http://helio.mssl.ucl.ac.uk/helio-hec/HelioService1_0?wsdl',
'http://helio.mssl.ucl.ac.uk/helio-hec/HelioService1_0b?wsdl',
Expand Down Expand Up @@ -140,7 +140,7 @@ def taverna_parser(link):
Examples
--------
>>> from sunpy.net.helio import parser
>>> parser.taverna_parser('http://msslkz.mssl.ucl.ac.uk/helio-hec/HelioService') # doctest: +REMOTE_DATA
>>> parser.taverna_parser('http://msslkz.mssl.ucl.ac.uk/helio-hec/HelioService') # doctest: +SKIP
['http://helio.mssl.ucl.ac.uk/helio-hec/HelioTavernaService?wsdl']

"""
Expand Down Expand Up @@ -176,9 +176,9 @@ def link_test(link):
Examples
--------
>>> from sunpy.net.helio import parser
>>> result = parser.link_test('http://msslkz.mssl.ucl.ac.uk/helio-hec/HelioService') # doctest: +REMOTE_DATA
>>> result = parser.link_test('http://msslkz.mssl.ucl.ac.uk/helio-hec/HelioService') # doctest: +SKIP

>>> print(parser.link_test('http://rrnx.invalid_url5523.com')) # doctest: +REMOTE_DATA
>>> print(parser.link_test('http://rrnx.invalid_url5523.com')) # doctest: +SKIP
None
"""
try:
Expand Down Expand Up @@ -212,7 +212,7 @@ def wsdl_retriever(service='HEC'):
Examples
--------
>>> from sunpy.net.helio import parser
>>> parser.wsdl_retriever() # doctest: +REMOTE_DATA
>>> parser.wsdl_retriever() # doctest: +SKIP
'http://helio.mssl.ucl.ac.uk/helio-hec/HelioTavernaService?wsdl'

Notes
Expand Down
2 changes: 1 addition & 1 deletion sunpy/net/helio/tests/test_helio.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

# Currently helio makes unverified requests - this filter should be removed when
# https://github.com/sunpy/sunpy/issues/4401 is fixed
pytestmark = pytest.mark.filterwarnings('ignore:Unverified HTTPS request is being made')
pytestmark = [pytest.mark.filterwarnings('ignore:Unverified HTTPS request is being made'), pytest.mark.xfail(reason="HEC is currently down")]


def wsdl_endpoints():
Expand Down
2 changes: 1 addition & 1 deletion sunpy/timeseries/sources/tests/test_goes.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def test_goes_remote():
assert isinstance(goes, sunpy.timeseries.sources.goes.XRSTimeSeries)
# Testing NOAA served data
goes = sunpy.timeseries.TimeSeries(
'https://data.ngdc.noaa.gov/platforms/solar-space-observing-satellites/goes/goes16/l2/data/xrsf-l2-flx1s_science/2022/05/sci_xrsf-l2-flx1s_g16_d20220506_v2-1-0.nc')
'https://data.ngdc.noaa.gov/platforms/solar-space-observing-satellites/goes/goes16/l2/data/xrsf-l2-flx1s_science/2022/05/sci_xrsf-l2-flx1s_g16_d20220506_v2-2-0.nc')
assert isinstance(goes, sunpy.timeseries.sources.goes.XRSTimeSeries)


Expand Down