Blame python-gatspy-fix-tests-download.patch

Christian Dersch b756ace
diff --git a/gatspy/datasets/tests/test_download_data.py b/gatspy/datasets/tests/test_download_data.py
Christian Dersch b756ace
index 93791c7..c65edb9 100644
Christian Dersch b756ace
--- a/gatspy/datasets/tests/test_download_data.py
Christian Dersch b756ace
+++ b/gatspy/datasets/tests/test_download_data.py
Christian Dersch b756ace
@@ -16,7 +16,11 @@
Christian Dersch b756ace
 def test_downloads():
Christian Dersch b756ace
     for downloader in (fetch_rrlyrae, fetch_rrlyrae_fitdata,
Christian Dersch b756ace
                        fetch_rrlyrae_templates, fetch_rrlyrae_lc_params):
Christian Dersch b756ace
-        data = downloader()
Christian Dersch b756ace
+        try:
Christian Dersch b756ace
+            data = downloader()
Christian Dersch b756ace
+        except (URLError, ConnectionError):
Christian Dersch b756ace
+            raise SkipTest("No internet connection: "
Christian Dersch b756ace
+                           "data download test skipped")
Christian Dersch b756ace
         assert data is not None
Christian Dersch b756ace
 
Christian Dersch b756ace
 
Christian Dersch b756ace
diff --git a/gatspy/datasets/tests/test_rrlyrae.py b/gatspy/datasets/tests/test_rrlyrae.py
Christian Dersch b756ace
index 5cc8a12..1a089e2 100644
Christian Dersch b756ace
--- a/gatspy/datasets/tests/test_rrlyrae.py
Christian Dersch b756ace
+++ b/gatspy/datasets/tests/test_rrlyrae.py
Christian Dersch b756ace
@@ -6,7 +6,11 @@
Christian Dersch b756ace
 
Christian Dersch b756ace
 def test_rrlyrae_lightcurves():
Christian Dersch b756ace
     for partial in [True, False]:
Christian Dersch b756ace
-        rrlyrae = fetch_rrlyrae(partial=partial)
Christian Dersch b756ace
+        try:
Christian Dersch b756ace
+            rrlyrae = fetch_rrlyrae(partial=partial)
Christian Dersch b756ace
+        except(URLError, ConnectionError):
Christian Dersch b756ace
+            raise SkipTest("No internet connection: "
Christian Dersch b756ace
+                           "data download test skipped")
Christian Dersch b756ace
         lcid = rrlyrae.ids[0]
Christian Dersch b756ace
 
Christian Dersch b756ace
         if not partial:
Christian Dersch b756ace
@@ -34,21 +38,33 @@ def test_rrlyrae_lightcurves():
Christian Dersch b756ace
 
Christian Dersch b756ace
 
Christian Dersch b756ace
 def test_bad_lcid():
Christian Dersch b756ace
-    rrlyrae = fetch_rrlyrae()
Christian Dersch b756ace
+    try:
Christian Dersch b756ace
+        rrlyrae = fetch_rrlyrae()
Christian Dersch b756ace
+    except(URLError, ConnectionError):
Christian Dersch b756ace
+        raise SkipTest("No internet connection: "
Christian Dersch b756ace
+                       "data download test skipped")
Christian Dersch b756ace
     lcid = 'BAD_ID'
Christian Dersch b756ace
 
Christian Dersch b756ace
     assert_raises(ValueError, rrlyrae.get_lightcurve, lcid)
Christian Dersch b756ace
     assert_raises(ValueError, rrlyrae.get_metadata, lcid)
Christian Dersch b756ace
     assert_raises(ValueError, rrlyrae.get_obsmeta, lcid)
Christian Dersch b756ace
 
Christian Dersch b756ace
-    rrlyrae = fetch_rrlyrae(partial=True)
Christian Dersch b756ace
+    try:
Christian Dersch b756ace
+        rrlyrae = fetch_rrlyrae(partial=True)
Christian Dersch b756ace
+    except(URLError, ConnectionError):
Christian Dersch b756ace
+        raise SkipTest("No internet connection: "
Christian Dersch b756ace
+                       "data download test skipped")
Christian Dersch b756ace
     assert_raises(ValueError, rrlyrae.get_lightcurve, rrlyrae.ids[0],
Christian Dersch b756ace
                   return_1d=False)
Christian Dersch b756ace
 
Christian Dersch b756ace
 
Christian Dersch b756ace
 def test_rrlyrae_pickle():
Christian Dersch b756ace
     for partial in [True, False]:
Christian Dersch b756ace
-        rrlyrae = fetch_rrlyrae(partial=partial)
Christian Dersch b756ace
+        try:
Christian Dersch b756ace
+            rrlyrae = fetch_rrlyrae(partial=partial)
Christian Dersch b756ace
+        except(URLError, ConnectionError):
Christian Dersch b756ace
+            raise SkipTest("No internet connection: "
Christian Dersch b756ace
+                           "data download test skipped")        
Christian Dersch b756ace
         s = pickle.dumps(rrlyrae)
Christian Dersch b756ace
         rrlyrae2 = pickle.loads(s)
Christian Dersch b756ace
 
Christian Dersch b756ace
@@ -58,7 +74,12 @@ def test_rrlyrae_pickle():
Christian Dersch b756ace
 
Christian Dersch b756ace
 
Christian Dersch b756ace
 def test_rrlyrae_templates():
Christian Dersch b756ace
-    templates = fetch_rrlyrae_templates()
Christian Dersch b756ace
+    try:
Christian Dersch b756ace
+        templates = fetch_rrlyrae_templates()
Christian Dersch b756ace
+    except(URLError, ConnectionError):
Christian Dersch b756ace
+        raise SkipTest("No internet connection: "
Christian Dersch b756ace
+                       "data download test skipped")
Christian Dersch b756ace
+
Christian Dersch b756ace
     filename = templates.filenames[0]
Christian Dersch b756ace
     tid = templates.ids[0]
Christian Dersch b756ace
     t = templates.get_template(tid)
Christian Dersch b756ace
diff --git a/gatspy/datasets/tests/test_rrlyrae_generated.py b/gatspy/datasets/tests/test_rrlyrae_generated.py
Christian Dersch b756ace
index abc4279..bbe18b4 100644
Christian Dersch b756ace
--- a/gatspy/datasets/tests/test_rrlyrae_generated.py
Christian Dersch b756ace
+++ b/gatspy/datasets/tests/test_rrlyrae_generated.py
Christian Dersch b756ace
@@ -3,7 +3,12 @@
Christian Dersch b756ace
 
Christian Dersch b756ace
 
Christian Dersch b756ace
 def test_rrlyrae_generated():
Christian Dersch b756ace
-    rrlyrae = fetch_rrlyrae()
Christian Dersch b756ace
+    try:
Christian Dersch b756ace
+        rrlyrae = fetch_rrlyrae()
Christian Dersch b756ace
+    except(URLError, ConnectionError):
Christian Dersch b756ace
+        raise SkipTest("No internet connection: "
Christian Dersch b756ace
+                       "data download test skipped")
Christian Dersch b756ace
+
Christian Dersch b756ace
     lcid = rrlyrae.ids[100]
Christian Dersch b756ace
 
Christian Dersch b756ace
     gen = RRLyraeGenerated(lcid)
Christian Dersch b756ace
diff --git a/gatspy/periodic/tests/test_templates.py b/gatspy/periodic/tests/test_templates.py
Christian Dersch b756ace
index bb85aa1..465f428 100644
Christian Dersch b756ace
--- a/gatspy/periodic/tests/test_templates.py
Christian Dersch b756ace
+++ b/gatspy/periodic/tests/test_templates.py
Christian Dersch b756ace
@@ -9,7 +9,12 @@
Christian Dersch b756ace
 def test_basic_template_model():
Christian Dersch b756ace
     template_id = 25
Christian Dersch b756ace
 
Christian Dersch b756ace
-    templates = fetch_rrlyrae_templates()
Christian Dersch b756ace
+    try:
Christian Dersch b756ace
+        templates = fetch_rrlyrae_templates()
Christian Dersch b756ace
+    except(URLError, ConnectionError):
Christian Dersch b756ace
+        raise SkipTest("No internet connection: "
Christian Dersch b756ace
+                       "data download test skipped")
Christian Dersch b756ace
+
Christian Dersch b756ace
     phase, y = templates.get_template(templates.ids[template_id])
Christian Dersch b756ace
     model = UnivariateSpline(phase, y, s=0, k=5)
Christian Dersch b756ace
 
Christian Dersch b756ace
@@ -38,7 +43,12 @@ def test_basic_template_model():
Christian Dersch b756ace
 def test_multiband_fit():
Christian Dersch b756ace
     # TODO: this is a long test.
Christian Dersch b756ace
     # We could artificially limit the number of templates to make it faster
Christian Dersch b756ace
-    rrlyrae = fetch_rrlyrae()
Christian Dersch b756ace
+    try:
Christian Dersch b756ace
+        rrlyrae = fetch_rrlyrae()
Christian Dersch b756ace
+    except(URLError, ConnectionError):
Christian Dersch b756ace
+        raise SkipTest("No internet connection: "
Christian Dersch b756ace
+                       "data download test skipped")
Christian Dersch b756ace
+
Christian Dersch b756ace
     t, y, dy, filts = rrlyrae.get_lightcurve(rrlyrae.ids[0])
Christian Dersch b756ace
     t = t[::10]
Christian Dersch b756ace
     y = y[::10]
Christian Dersch b756ace
@@ -63,4 +73,9 @@ def test_multiband_fit():
Christian Dersch b756ace
 
Christian Dersch b756ace
 
Christian Dersch b756ace
 def test_bad_args():
Christian Dersch b756ace
-    assert_raises(ValueError, RRLyraeTemplateModeler, filts='abc')
Christian Dersch b756ace
+    try:
Christian Dersch b756ace
+        assert_raises(ValueError, RRLyraeTemplateModeler, filts='abc')
Christian Dersch b756ace
+    except(URLError, ConnectionError):
Christian Dersch b756ace
+        raise SkipTest("No internet connection: "
Christian Dersch b756ace
+                       "data download test skipped")
Christian Dersch b756ace
+
Christian Dersch b756ace
diff --git a/gatspy/datasets/tests/test_rrlyrae.py b/gatspy/datasets/tests/test_rrlyrae.py
Christian Dersch b756ace
index 1a089e2..ae55220 100644
Christian Dersch b756ace
--- a/gatspy/datasets/tests/test_rrlyrae.py
Christian Dersch b756ace
+++ b/gatspy/datasets/tests/test_rrlyrae.py
Christian Dersch b756ace
@@ -2,7 +2,16 @@
Christian Dersch b756ace
 import numpy as np
Christian Dersch b756ace
 from numpy.testing import assert_equal, assert_raises
Christian Dersch b756ace
 from .. import fetch_rrlyrae, fetch_rrlyrae_templates
Christian Dersch b756ace
-
Christian Dersch b756ace
+from nose import SkipTest
Christian Dersch b756ace
+
Christian Dersch b756ace
+try:
Christian Dersch b756ace
+    # Python 3
Christian Dersch b756ace
+    from urllib.error import URLError
Christian Dersch b756ace
+    ConnectionError = ConnectionResetError
Christian Dersch b756ace
+except ImportError:
Christian Dersch b756ace
+    # Python 2
Christian Dersch b756ace
+    from urllib2 import URLError
Christian Dersch b756ace
+    from socket import error as ConnectionError
Christian Dersch b756ace
 
Christian Dersch b756ace
 def test_rrlyrae_lightcurves():
Christian Dersch b756ace
     for partial in [True, False]:
Christian Dersch b756ace
diff --git a/gatspy/datasets/tests/test_rrlyrae_generated.py b/gatspy/datasets/tests/test_rrlyrae_generated.py
Christian Dersch b756ace
index bbe18b4..82cd976 100644
Christian Dersch b756ace
--- a/gatspy/datasets/tests/test_rrlyrae_generated.py
Christian Dersch b756ace
+++ b/gatspy/datasets/tests/test_rrlyrae_generated.py
Christian Dersch b756ace
@@ -1,6 +1,17 @@
Christian Dersch b756ace
 from numpy.testing import assert_equal
Christian Dersch b756ace
 from .. import RRLyraeGenerated, fetch_rrlyrae
Christian Dersch b756ace
 
Christian Dersch b756ace
+from nose import SkipTest
Christian Dersch b756ace
+
Christian Dersch b756ace
+try:
Christian Dersch b756ace
+    # Python 3
Christian Dersch b756ace
+    from urllib.error import URLError
Christian Dersch b756ace
+    ConnectionError = ConnectionResetError
Christian Dersch b756ace
+except ImportError:
Christian Dersch b756ace
+    # Python 2
Christian Dersch b756ace
+    from urllib2 import URLError
Christian Dersch b756ace
+    from socket import error as ConnectionError
Christian Dersch b756ace
+
Christian Dersch b756ace
 
Christian Dersch b756ace
 def test_rrlyrae_generated():
Christian Dersch b756ace
     try:
Christian Dersch b756ace
diff --git a/gatspy/periodic/tests/test_templates.py b/gatspy/periodic/tests/test_templates.py
Christian Dersch b756ace
index 465f428..abda305 100644
Christian Dersch b756ace
--- a/gatspy/periodic/tests/test_templates.py
Christian Dersch b756ace
+++ b/gatspy/periodic/tests/test_templates.py
Christian Dersch b756ace
@@ -1,5 +1,15 @@
Christian Dersch b756ace
 import numpy as np
Christian Dersch b756ace
 from numpy.testing import assert_allclose, assert_raises
Christian Dersch b756ace
+from nose import SkipTest
Christian Dersch b756ace
+
Christian Dersch b756ace
+try:
Christian Dersch b756ace
+    # Python 3
Christian Dersch b756ace
+    from urllib.error import URLError
Christian Dersch b756ace
+    ConnectionError = ConnectionResetError
Christian Dersch b756ace
+except ImportError:
Christian Dersch b756ace
+    # Python 2
Christian Dersch b756ace
+    from urllib2 import URLError
Christian Dersch b756ace
+    from socket import error as ConnectionError
Christian Dersch b756ace
 
Christian Dersch b756ace
 from .. import RRLyraeTemplateModeler, RRLyraeTemplateModelerMultiband
Christian Dersch b756ace
 from ...datasets import fetch_rrlyrae_templates, fetch_rrlyrae