Merge pull request #1271 from dpshelio/noaa

Updated SWPC/NOAA links
sunpy · Jan 23, 2015 · 754a015 · 754a015
2 parents 7655136 + 13d3bc8
commit 754a015
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/sunpy/lightcurve/sources/noaa.py b/sunpy/lightcurve/sources/noaa.py
@@ -33,10 +33,10 @@ class NOAAIndicesLightCurve(LightCurve):
 
     References
     ----------
-    | http://www.swpc.noaa.gov/Data/index.html#indices
-    | http://www.swpc.noaa.gov/ftpdir/weekly/README3
-    | http://www.swpc.noaa.gov/ftpdir/weekly/RecentIndices.txt
-    | http://www.swpc.noaa.gov/SolarCycle/
+    | http://legacy-www.swpc.noaa.gov/Data/index.html#indices
+    | ftp://ftp.swpc.noaa.gov/pub/weekly/README3
+    | ftp://ftp.swpc.noaa.gov/pub/weekly/RecentIndices.txt
+    | http://www.swpc.noaa.gov/products/solar-cycle-progression
     """
 
     def peek(self, axes=None, type='sunspot SWO', **plot_args):
@@ -78,7 +78,7 @@ def peek(self, axes=None, type='sunspot SWO', **plot_args):
     @classmethod
     def _get_default_uri(cls):
         """Return the url to download indices"""
-        return "http://www.swpc.noaa.gov/ftpdir/weekly/RecentIndices.txt"
+        return "ftp://ftp.swpc.noaa.gov/pub/weekly/RecentIndices.txt"
 
     @staticmethod
     def _get_url_for_date_range(*args, **kwargs):
@@ -125,9 +125,10 @@ class NOAAPredictIndicesLightCurve(LightCurve):
 
     References
     ----------
-    | http://www.swpc.noaa.gov/Data/index.html#indices
-    | http://www.swpc.noaa.gov/ftpdir/weekly/Predict.txt
-    | http://www.swpc.noaa.gov/SolarCycle/
+    | http://legacy-www.swpc.noaa.gov/Data/index.html#indices
+    | http://services.swpc.noaa.gov/text/predicted-sunspot-radio-flux.txt
+    | http://www.swpc.noaa.gov/products/solar-cycle-progression
+    | http://www.swpc.noaa.gov/products-and-data
     """
 
     def peek(self, axes=None, **plot_args):
@@ -154,7 +155,7 @@ def peek(self, axes=None, **plot_args):
     @classmethod
     def _get_default_uri(cls):
         """Return the url to download indices"""
-        return "http://www.swpc.noaa.gov/ftpdir/weekly/Predict.txt"
+        return "http://services.swpc.noaa.gov/text/predicted-sunspot-radio-flux.txt"
 
     @staticmethod
     def _get_url_for_date_range(*args, **kwargs):

diff --git a/sunpy/lightcurve/tests/test_noaa.py b/sunpy/lightcurve/tests/test_noaa.py
@@ -24,7 +24,7 @@ def test_isempty(self):
     @pytest.mark.online
     def test_url(self):
         """Test creation with url"""
-        url = 'http://www.swpc.noaa.gov/ftpdir/weekly/RecentIndices.txt'
+        url = 'ftp://ftp.swpc.noaa.gov/pub/weekly/RecentIndices.txt'
         lc1 = sunpy.lightcurve.NOAAIndicesLightCurve.create(url)
         assert isinstance(lc1, sunpy.lightcurve.NOAAIndicesLightCurve)
 
@@ -37,7 +37,7 @@ def test_goes_timerange(self):
     def test_get_url(self):
         """Test the getting of url"""
         g = sunpy.lightcurve.NOAAIndicesLightCurve
-        assert g._get_url_for_date_range(timerange_a) == 'http://www.swpc.noaa.gov/ftpdir/weekly/RecentIndices.txt'
+        assert g._get_url_for_date_range(timerange_a) == 'ftp://ftp.swpc.noaa.gov/pub/weekly/RecentIndices.txt'
 
     @pytest.mark.online
     def test_header(self):
@@ -69,14 +69,14 @@ def test_goes_timerange(self):
     @pytest.mark.online
     def test_url(self):
         """Test creation with url"""
-        url = 'http://www.swpc.noaa.gov/ftpdir/weekly/Predict.txt'
+        url = 'http://services.swpc.noaa.gov/text/predicted-sunspot-radio-flux.txt'
         lc1 = sunpy.lightcurve.NOAAPredictIndicesLightCurve.create(url)
         assert isinstance(lc1, sunpy.lightcurve.NOAAPredictIndicesLightCurve)
 
     def test_get_url(self):
         """Test the getting of url"""
         g = sunpy.lightcurve.NOAAPredictIndicesLightCurve
-        assert g._get_url_for_date_range(timerange_a) == 'http://www.swpc.noaa.gov/ftpdir/weekly/Predict.txt'
+        assert g._get_url_for_date_range(timerange_a) == 'http://services.swpc.noaa.gov/text/predicted-sunspot-radio-flux.txt'
 
     @pytest.mark.online
     def test_header(self):