Merge pull request #274 from ska-sa/fix-deprecations

Fix deprecations

montblanc/impl/rime/tensorflow/RimeSolver.py

@@ -173,7 +173,7 @@ def pop(self, key, default=None):
         cpus = [d.name for d in devices if d.device_type == 'CPU']
 
         if device_type == 'GPU' and len(gpus) == 0:
-            montblanc.log.warn("No GPUs are present, falling back to CPU.")
+            montblanc.log.warning("No GPUs are present, falling back to CPU.")
             device_type = 'CPU'
 
         use_cpus = device_type == 'CPU'

montblanc/impl/rime/tensorflow/hypercube_proxy_metaclass.py

@@ -52,7 +52,7 @@ def _proxy(self, *args, **kwargs):
                 return getattr(self._cube, name)(*args, **kwargs)
 
             wrap = functools.update_wrapper(_proxy, method)
-            spec = inspect.getargspec(method)
+            spec = inspect.getfullargspec(method)
             return wrap
 
         for name, method in hc_members:

montblanc/impl/rime/tensorflow/ms/ms_manager.py

@@ -32,7 +32,7 @@
     'INT' : np.int32,
     'FLOAT' : np.float32,
     'DOUBLE' : np.float64,
-    'BOOLEAN' : np.bool,
+    'BOOLEAN' : np.bool_,
     'COMPLEX' : np.complex64,
     'DCOMPLEX' : np.complex128
 }
@@ -246,7 +246,7 @@ def __init__(self, msname, slvr_cfg):
                 d, s in zip(MS_DIM_ORDER, shape))
             row_desc = " x ".join('%s' % s for s in shape)
 
-            montblanc.log.warn("Encountered '{msr}' rows in '{ms}' "
+            montblanc.log.warning("Encountered '{msr}' rows in '{ms}' "
                 "but expected '{rd} = {er}' after finding the following "
                 "dimensions by inspection: [{d}]. Irregular Measurement Sets "
                 "are not fully supported due to the generality of the format.".format(

montblanc/impl/rime/tensorflow/sinks/ms_sink_provider.py

@@ -73,7 +73,7 @@ def model_vis(self, context):
         if msshape is None:
             guessed_shape = [self._manager._nchan, 4]
 
-            montblanc.log.warn("Could not obtain 'shape' from the '{c}' "
+            montblanc.log.warning("Could not obtain 'shape' from the '{c}' "
                 "column descriptor. Guessing it is '{gs}'.".format(
                     c=column, gs=guessed_shape))
 

montblanc/impl/rime/tensorflow/sinks/sink_provider.py

@@ -70,7 +70,7 @@ def f(self, ctx):
     SINK_ARGSPEC = ['self', 'context']
 
     return { n: m for n, m in inspect.getmembers(obj, inspect.ismethod)
-        if inspect.getargspec(m)[0] == SINK_ARGSPEC }
+        if inspect.getfullargspec(m)[0] == SINK_ARGSPEC }
 
 class SinkProvider(AbstractSinkProvider):
 

montblanc/impl/rime/tensorflow/sources/source_provider.py

@@ -89,7 +89,7 @@ def f(self, ctx):
 
     return { n: m for n, m in inspect.getmembers(obj, callable)
         if not n.startswith('_') and
-        inspect.getargspec(m).args in argspec }
+        inspect.getfullargspec(m).args in argspec }
 
 
 class SourceProvider(AbstractSourceProvider):

montblanc/util/parallactic_angles.py

@@ -28,7 +28,7 @@
     pm = pyrap.measures.measures()
 except ImportError as e:
     pm = None
-    montblanc.log.warn("python-casacore import failed. "
+    montblanc.log.warning("python-casacore import failed. "
                        "Parallactic Angle computation will fail.")
 
 def parallactic_angles(times, antenna_positions, field_centre, offsets=None):

setup.py

@@ -91,7 +91,7 @@ def nvcc_compiler_settings():
 
     # No NVCC, try find it in the CUDA_PATH
     if not nvcc_found:
-        log.warn("nvcc compiler not found at '{}'. "
+        log.warning("nvcc compiler not found at '{}'. "
             "Searching within the CUDA_PATH '{}'"
                 .format(nvcc_path, cuda_path))
 
@@ -109,7 +109,7 @@ def nvcc_compiler_settings():
         cuda_path = os.path.normpath(
             os.path.join(os.path.dirname(nvcc_path), ".."))
 
-        log.warn("CUDA_PATH not found, inferring it as '{}' "
+        log.warning("CUDA_PATH not found, inferring it as '{}' "
             "from the nvcc location '{}'".format(
                 cuda_path, nvcc_path))
 
@@ -306,7 +306,7 @@ def dl_cub(cub_url, cub_archive_name):
 
         if (remote_file_size is not None and
                 not local_file_size == remote_file_size):
-            log.warn("Local file size '{}' "
+            log.warning("Local file size '{}' "
                 "does not match remote '{}'".format(
                     local_file_size, remote_file_size))
 
@@ -753,7 +753,7 @@ def readme():
 log.info('install_requires={}'.format(install_requires))
 
 setup(name='montblanc',
-    version="0.7.0",
+    version="0.7.1",
     description='GPU-accelerated RIME implementations.',
     long_description=readme(),
     url='http://github.com/ska-sa/montblanc',