gwpy 3.0.11__tar.gz → 3.0.12__tar.gz

{gwpy-3.0.11 → gwpy-3.0.12}/.gitlab/ci/rules.yml

@@ -66,7 +66,7 @@ spec:
 # full test suite
 .rules_full_test:
   rules:
-    - !reference [.rules_default_push, rules]
+    - !reference [.rules_default, rules]
     - !reference [.rules_merge_request, rules]
 
 # basic test suite

{gwpy-3.0.11 → gwpy-3.0.12}/.gitlab-ci.yml

@@ -22,7 +22,11 @@ default:
   retry:
     max: 2
     when:
+      - job_execution_timeout
       - runner_system_failure
+      - stuck_or_timeout_failure
+  # no job should take more than an hour
+  timeout: 1h
 
 include:
   # -- Quality assurance checks

{gwpy-3.0.11 → gwpy-3.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: gwpy
-Version: 3.0.11
+Version: 3.0.12
 Summary: A python package for gravitational-wave astrophysics
 Author-email: Duncan Macleod <duncan.macleod@ligo.org>
 License: GPL-3.0-or-later

{gwpy-3.0.11 → gwpy-3.0.12}/gwpy/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.0.11'
-__version_tuple__ = version_tuple = (3, 0, 11)
+__version__ = version = '3.0.12'
+__version_tuple__ = version_tuple = (3, 0, 12)

{gwpy-3.0.11 → gwpy-3.0.12}/gwpy/timeseries/core.py

@@ -425,6 +425,9 @@ class TimeSeriesBase(Series):
             useful if the same remote data are to be accessed multiple times.
             Set `GWPY_CACHE=1` in the environment to auto-cache.
 
+        timeout : `float`, optional
+            the time to wait for a response from the GWOSC server.
+
         **kwargs
             any other keyword arguments are passed to the `TimeSeries.read`
             method that parses the file that was downloaded

{gwpy-3.0.11 → gwpy-3.0.12}/gwpy/timeseries/io/losc.py

@@ -59,10 +59,16 @@ GWOSC_LOCATE_KWARGS = (
 
 # -- utilities ----------------------------------------------------------------
 
-def _download_file(url, cache=None, verbose=False):
+def _download_file(url, cache=None, verbose=False, timeout=None, **kwargs):
     if cache is None:
         cache = bool_env('GWPY_CACHE', False)
-    return get_readable_fileobj(url, cache=cache, show_progress=verbose)
+    return get_readable_fileobj(
+        url,
+        cache=cache,
+        show_progress=verbose,
+        remote_timeout=timeout,
+        **kwargs,
+    )
 
 
 def _fetch_gwosc_data_file(url, *args, **kwargs):
@@ -71,6 +77,7 @@ def _fetch_gwosc_data_file(url, *args, **kwargs):
     cls = kwargs.pop('cls', TimeSeries)
     cache = kwargs.pop('cache', None)
     verbose = kwargs.pop('verbose', False)
+    timeout = kwargs.pop('timeout', None)  # astropy will set a default
 
     # match file format
     if url.endswith('.gz'):
@@ -84,7 +91,7 @@ def _fetch_gwosc_data_file(url, *args, **kwargs):
     elif ext == '.gwf':
         kwargs.setdefault('format', 'gwf')
 
-    with _download_file(url, cache, verbose=verbose) as rem:
+    with _download_file(url, cache, verbose=verbose, timeout=timeout) as rem:
         # get channel for GWF if not given
         if ext == ".gwf" and (not args or args[0] is None):
             args = (_gwf_channel(rem, cls, kwargs.get("verbose")),)

{gwpy-3.0.11 → gwpy-3.0.12}/gwpy/timeseries/tests/test_timeseries.py

@@ -567,6 +567,7 @@ class TestTimeSeries(_TestTimeSeriesBase):
             *GWOSC_GW150914_SEGMENT,
             format=format,
             verbose=True,
+            timeout=60,
         )
         utils.assert_quantity_sub_equal(ts, gw150914,
                                         exclude=['name', 'unit', 'channel'])
@@ -577,6 +578,7 @@ class TestTimeSeries(_TestTimeSeriesBase):
             *GWOSC_GW150914_SEGMENT,
             format=format,
             sample_rate=16384,
+            timeout=60,
         )
         assert ts.sample_rate == 16384 * units.Hz
 

{gwpy-3.0.11 → gwpy-3.0.12}/gwpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: gwpy
-Version: 3.0.11
+Version: 3.0.12
 Summary: A python package for gravitational-wave astrophysics
 Author-email: Duncan Macleod <duncan.macleod@ligo.org>
 License: GPL-3.0-or-later