casaconfig 1.2.0__py3-none-any.whl → 1.4.0__py3-none-any.whl

casaconfig/private/measures_update.py

@@ -15,25 +15,29 @@
 this module will be included in the api
 """
 
-def measures_update(path=None, version=None, force=False, logger=None, auto_update_rules=False, use_astron_obs_table=False, verbose=None):
+def measures_update(path=None, version=None, force=False, measures_site=None, logger=None, auto_update_rules=False, use_astron_obs_table=False, verbose=None):
     """
-    Update or install the IERS data used for measures calculations from the ASTRON server at path.
+    Update or install the IERS data used for measures calculations from measures_site into path.
     
-    Original data source used by ASTRON is here: https://www.iers.org/IERS/EN/DataProducts/data.html
+    Original IERS data source used by each of the recommended measures sites
+    is here: https://www.iers.org/IERS/EN/DataProducts/data.html
 
     If no update is necessary then this function will silently return.
 
-    The verbose argument controls the level of information provided when this function when the data
-    are unchanged for expected reasons. A level of 0 prints and logs nothing. A
-    value of 1 logs the information and a value of 2 logs and prints the information.
+    The verbose argument controls the level of information provided by this function when the data
+    are unchanged for expected reasons. A level of 0 outputs nothing. A
+    value of 1 sends any output to the logger and a value of 2 logs and prints the information.
+    The default value of the verbose argument is taken from the casaconfig_verbose config
+    value (defaults to 1). Error messages are always logged and printed.
 
     CASA maintains a separate Observatories table which is available in the casarundata
-    collection through pull_data and data_update. The Observatories table found at ASTRON
+    collection through pull_data and data_update. The Observatories table found at measures_site
     is not installed by measures_update and any Observatories file at path will not be changed
-    by using this function.
+    by using this function. This behavior can be changed by setting force and use_astron_obs_table
+    both to True (use_astron_obs_table is ignored when force is False).
 
-    A text file (readme.txt in the geodetic directory in path) records the measures version string
-    and the date when that version was installed in path.
+    A text file (readme.txt in the geodetic directory in path) records the measures version string,
+    the measures site that was used and the date when that version was installed in path.
 
     If path is None then config.measurespath is used.
 
@@ -41,12 +45,26 @@ def measures_update(path=None, version=None, force=False, logger=None, auto_upda
     nothing unless force is True.
 
     If a specific version is not requested (the default) and the modification time of that text
-    file is less than 24 hrs before now then this function does nothing unless force is True. When this
-    function checks for a more recent version and finds that the installed version is the most recent
-    then modification time of that text file is checked to the current time even though nothing has
-    changed in path. This limits the number of attempts to update the measures data (including checking f\
-    or more recent data) to once per day. When the force argument is True and a specific version is
-    not requested then this function always checks for the latest version.
+    file is less than the measures_update_interval config value (days) before now then this function 
+    does nothing unless force is True. When this function checks for a more recent version and finds 
+    that the installed version is the most recent one then the modification time of that text file 
+    is changed to the current time even though nothing has changed in path. This limits the 
+    number of attempts to update the measures data (including checking
+    for more recent data) to once every measures_update_interval days. When the force argument 
+    is True and a specific version is not requested then this function always checks for the 
+    latest version. The measures_update_interval is always used as an int type (including
+    any truncation of the actual value in config if not an integer).
+
+    The measures_site is a single URL or a list of URLs to use to find the measures tar file
+    to use in the update. See measures_available for more details on how that parameter
+    is used.
+
+    If a specific version is requested then that must match a file in the list returned
+    by measures_available. The version is usually unique at each measures_site and so care
+    may need to be taken when requesting a specific version to ensure that it's available at 
+    measures_site. If measures_site is a list and a specific version is requested then
+    measures_update will try and find that version in each measures_site in that list, using
+    the first site that has that version.
 
     When auto_update_rules is True then path must exist and contain the expected readme.txt file.
     Path must be owned by the user, force must be False, and the version must be None. This 
@@ -75,11 +93,11 @@ def measures_update(path=None, version=None, force=False, logger=None, auto_upda
     especially if they may also be starting at that time. If a specific version is
     requested or force is True there is a risk that the measures may be updated while
     one of those other sessions are trying to load the same measures data, leading to
-    unpredictable results. The lock file will prevent simulateous updates from
-    happening but if each simultanous update eventually updates the same measures
+    unpredictable results. The lock file will prevent simultaneous updates from
+    happening but if each simultaneous update eventually updates the same measures
     location (because force is True or the updates are requesting different versions)
-    then the measures that any of those simultanous casatools modules sees is 
-    unpredictable. Avoid multiple, simultanous updates outside of the automatic
+    then the measures that any of those simultaneous casatools modules sees is 
+    unpredictable. Avoid multiple, simultaneous updates outside of the automatic
     update process.
 
     **Note:** during auto updates, measures_update requires that the expected 
@@ -91,10 +109,10 @@ def measures_update(path=None, version=None, force=False, logger=None, auto_upda
     read and write permissions there). The version must then also be None and the force option 
     must be False.
 
-    **Note::** During use outside of auto updates, if path does not exist it will be created
+    **Note:** During use outside of auto updates, if path does not exist it will be created
     by this function.
 
-    **Notes::** During use outside of auto updates, if the readme.txt file exists but can not
+    **Note:** During use outside of auto updates, if the readme.txt file exists but can not
     be read as expected **OR** that file does not exist but the contents of path appear to
     contain measures data (table names in the expected locations) then this function will
     print messages describing that and exit without changing anything at path. Using
@@ -104,39 +122,35 @@ def measures_update(path=None, version=None, force=False, logger=None, auto_upda
 
     Parameters
        - path (str=None) - Folder path to place updated measures data. Must contain a valid geodetic/readme.txt. If not set then config.measurespath is used.
-       - version (str=None) - Version of measures data to retrieve (usually in the form of yyyymmdd-160001.ztar, see measures_available()). Default None retrieves the latest.
+       - version (str=None) - Version of measures data to retrieve (usually in the form of WSRT_Measures_yyyymmdd-160001.ztar, see measures_available). Default None retrieves the latest.
        - force (bool=False) - If True, always re-download the measures data. Default False will not download measures data if updated within the past day unless the version parameter is specified and different from what was last downloaded.
+       - measures_site(str or list of str = None) - Each value is a URL where measures tar files are found. If measures_site is a list then the elements are used in order until a list can be assembled. Default None uses config.measures_site.
        - logger (casatools.logsink=None) - Instance of the casalogger to use for writing messages. Default None writes messages to the terminal
        - auto_update_rules (bool=False) - If True then the user must be the owner of path, version must be None, and force must be False.
-       - verbose (int=None) - Level of output, 0 is none, 1 is to logger, 2 is to logger and terminal, defaults to casaconfig_verbose in config dictionary.
+       - use_astron_obs_table (bool=False) - If True and force is also True then keep the Observatories table found in the Measures tar tarball (possibly overwriting the Observatories table from casarundata).
+       - verbose (int=None) - Level of output, 0 is none, 1 is to logger, 2 is to logger and terminal, defaults to config.casaconfig_verbose.
         
     Returns
        None
 
     Raises
-       casaconfig.AutoUpdatesNotAllowed - raised when path does not exists as a directory or is not owned by the user when auto_update_rules is True
-       casaconfig.BadLock - raised when the lock file was not empty when found
-       casaconfig.BadReadme - raised when something unexpected is found in the readme or the readme changed after an update is in progress
-       casaconfig.NoReadme - raised when the readme.txt file is not found at path (path also may not exist)
-       casaconfig.NotWritable - raised when the user does not have permission to write to path
-       casaconfig.NoNetwork - raised by measuers_available or when getting the lock file if there is no network.
-       casaconfig.RemoteError - raised by measures_available when the remote list of measures could not be fetched, not due to no network.
-       casaconfig.UnsetMeasurespath - raised when path is None and has not been set in config
-       Exception - raised when something unexpected happened while updating measures
+       - casaconfig.AutoUpdatesNotAllowed - raised when path does not exists as a directory or is not owned by the user when auto_update_rules is True
+       - casaconfig.BadLock - raised when the lock file was not empty when found
+       - casaconfig.BadReadme - raised when something unexpected is found in the readme or the readme changed after an update is in progress
+       - casaconfig.NoReadme - raised when the readme.txt file is not found at path (path also may not exist)
+       - casaconfig.NotWritable - raised when the user does not have permission to write to path
+       - casaconfig.NoNetwork - raised by measuers_available or when getting the lock file if there is no network.
+       - casaconfig.RemoteError - raised by measures_available when the remote list of measures could not be fetched, not due to no network.
+       - casaconfig.UnsetMeasurespath - raised when path is None and has not been set in config
+       - Exception - raised when something unexpected happened while updating measures
     
     """
     import os
-    import pkg_resources
     from datetime import datetime
     import sys
 
-    from ftplib import FTP
     import tarfile
     import re
-    import ssl
-    import urllib.request
-    import certifi
-    import fcntl
 
     from casaconfig import measures_available
     from casaconfig import AutoUpdatesNotAllowed, UnsetMeasurespath, RemoteError, NotWritable, BadReadme, BadLock, NoReadme, NoNetwork
@@ -145,16 +159,20 @@ def measures_update(path=None, version=None, force=False, logger=None, auto_upda
     from .get_data_lock import get_data_lock
     from .get_data_info import get_data_info
     from .measures_available import measures_available
-    
+    from .do_untar_url import do_untar_url
+
+    from .. import config as _config
+
     if path is None:
-        from .. import config as _config
         path = _config.measurespath
 
     if path is None:
         raise UnsetMeasurespath('measures_update: path is None and has not been set in config.measurespath. Provide a valid path and retry.')
 
+    if measures_site is None:
+        measures_site = _config.measures_site
+
     if verbose is None:
-        from .. import config as _config
         verbose = _config.casaconfig_verbose
 
     path = os.path.expanduser(path)
@@ -173,42 +191,52 @@ def measures_update(path=None, version=None, force=False, logger=None, auto_upda
         # make dirs all the way down, if possible
         os.makedirs(path)
         
-    current = None
+    currentVersion = None
     ageRecent = False
+    currentSite = None
 
     # first, does this look like it needs to be updated
 
     # get any existing measures readme information
     readmeInfo = get_data_info(path, logger, type='measures')
     if readmeInfo is not None:
-        current = readmeInfo['version']
+        currentVersion = readmeInfo['version']
+        currentSite = readmeInfo['site']
         if readmeInfo['age'] is not None:
-            ageRecent = readmeInfo['age'] < 1.0
+            ageRecent = readmeInfo['age'] < int(_config.measures_update_interval)
 
     if not force:
-        # don't check for new version if the age is less than 1 day
+        # don't check for new version if the age is less than measures_update_interval days
         if version is None and ageRecent:
-            if verbose > 0:
-                print_log_messages('measures_update: version installed or checked less than 1 day ago, nothing updated or checked', logger, verbose=verbose)
+            print_log_messages('measures_update: version installed or checked less than %s day(s) ago, nothing updated or checked' % int(_config.measures_update_interval), logger, verbose=verbose)
             return
         
-        # don't overwrite something that looks bad unless forced to do so
-        if current == 'invalid':
-            raise NoReadme('measures_update: no measures readme.txt file found at %s. Nothing updated or checked.' % path)
-        
-        if current == 'error':
-            raise BadReadme('measures_update: the measures readme.txt file at %s could not be read as expected, an update can not proceed unless force is True' % path)
-
-        # don't overwrite something that looks like valid measures data unless forced to do so
-        if current == 'unknown':
-            print_log_messages('measures_update: the measures data at %s is not maintained by casaconfig and so it can not be updated unless force is True' % path, logger)
-            return
+        if currentVersion is not None:
+            # don't overwrite something that looks bad unless forced to do so
+            if 'invalid' in currentVersion:
+                raise NoReadme('measures_update: no measures readme.txt file found at %s. Nothing updated or checked.' % path)
+
+            if 'error' in currentVersion:
+                msg = "measures_update: the measures readme.txt file at %s could not be read as expected, an update can not proceed unless force is True" % path
+                # add any additional error message, anything after the first ":" if is found
+                colonIndex = currentVersion.find(":")
+                if colonIndex != -1:
+                    msg += "; " + currentVersion[colonIndex+1:]
+                raise BadReadme(msg)
+
+            # don't overwrite something that looks like valid measures data unless forced to do so
+            if 'unknown' in currentVersion:
+                print_log_messages('measures_update: the measures data at %s is not maintained by casaconfig and so it can not be updated unless force is True' % path, logger, True)
+                return
 
         checkVersion = version
         if checkVersion is None:
             # get the current most recent version
             try:
-                checkVersion = measures_available()[-1]
+                # if measures_site is a list, measures_available will return the list from the appropriate site in that list
+                # that might not be the same site recorded with currentVersion, but that's OK for this update step
+                # the currentVersion is already old enough to trigger this check for a more recent version
+                checkVersion = measures_available(measures_site=measures_site)[-1]
             except NoNetwork as exc:
                 # no network, no point in continuing, just reraise
                 raise exc
@@ -217,12 +245,14 @@ def measures_update(path=None, version=None, force=False, logger=None, auto_upda
                 raise exc                
             except:
                 # unsure what happened, leave it at none, which will trigger an update attempt, which might work
+                print("unexpected excption in measuress_available")
+                import traceback
+                traceback.print_exc()
                 pass
 
         # don't re-download the same data
-        if (checkVersion is not None) and (checkVersion == current):
-            if verbose > 0:
-                print_log_messages('measures_update: requested version already installed in %s' % path, logger, verbose=verbose)
+        if (checkVersion is not None) and (checkVersion == currentVersion):
+            print_log_messages('measures_update: requested version already installed in %s' % path, logger, verbose=verbose)
             # update the age of the readme to now
             readme_path = os.path.join(path,'geodetic/readme.txt')
             # readme_path should already exist if it's here
@@ -236,7 +266,7 @@ def measures_update(path=None, version=None, force=False, logger=None, auto_upda
             msgs = []
             msgs.append("Error: the Observatories table was not found as expected in %s" % path)
             msgs.append("Either install casarundata first or set use_astron_obs_table and force to be True when using measures_update.")
-            msgs.append("Note that the Observatories table provided in the Astron measures tarfile is not the same as that maintained by CASA")
+            msgs.append("Note that the Observatories table provided in the measures tarfile is not the same as that maintained by CASA")
             print_log_messages(msgs, logger, True)
             return
         
@@ -248,9 +278,9 @@ def measures_update(path=None, version=None, force=False, logger=None, auto_upda
 
     # lock the measures_update.lock file
     lock_fd = None
-    clean_lock = True    # set to false if the contents are actively being u pdate and the lock file should not be cleaned one exception
+    clean_lock = True    # set to false if the contents are actively being update and the lock file should not be cleaned one exception
     try:
-        print_log_messages('measures_update ... acquiring the lock ... ', logger)
+        print_log_messages('measures_update ... acquiring the lock ... ', logger, verbose=verbose)
 
         # the BadLock exception that may happen here is caught below
         lock_fd = get_data_lock(path, 'measures_update')
@@ -259,21 +289,19 @@ def measures_update(path=None, version=None, force=False, logger=None, auto_upda
         
         if not do_update:
             # recheck the readme file, another update may have already happened before the lock was obtained
-            current = None
+            currentVersion = None
             ageRecent = False
             
             readmeInfo = get_data_info(path, logger, type='measures')
             if readmeInfo is not None:
-                current = readmeInfo['version']
+                currentVersion = readmeInfo['version']
                 if readmeInfo['age'] is not None:
-                    ageRecent = readmeInfo['age'] < 1.0
+                    ageRecent = readmeInfo['age'] < int(_config.measures_update_interval)
 
-            if (version is not None) and (version == current):
-                # no update will be done, version is as requested - always verbose here because the lock is in use
-                print_log_messages('The requested measures version is already installed in %s, using version %s' % (path, current), logger)
+            if (version is not None) and (version == currentVersion):
+                print_log_messages('The requested measures version is already installed in %s, using version %s' % (path, currentVersion), logger, verbose=verbose)
             elif (version is None) and ageRecent:
-                # no update will be done, it's already been checked or updated recently - always verbose here because the lock is in use
-                print_log_messages('The latest measures version was checked recently in %s, using version %s' % (path, current), logger)
+                print_log_messages('The latest measures version was checked recently in %s, using version %s' % (path, currentVersion), logger, verbose=verbose)
             else:
                 # final check for problems before updating
                 if not force and readmeInfo is not None and (version=='invalid' or version=='unknown'):
@@ -288,69 +316,86 @@ def measures_update(path=None, version=None, force=False, logger=None, auto_upda
 
         if do_update:
             if force:
-                print_log_messages('A measures update has been requested by the force argument', logger)
-
-            print_log_messages('  ... connecting to ftp.astron.nl ...', logger)
-
-            clean_lock = False
-            ftp = FTP('ftp.astron.nl')
-            rc = ftp.login()
-            rc = ftp.cwd('outgoing/Measures')
-            files = sorted([ff for ff in ftp.nlst() if (len(ff) > 0) and (not ff.endswith('.dat')) and (ftp.size(ff) > 0)])
-
-            # target filename to download
-            # for the non-force unspecified version case this can only get here if the age is > 1 day so there should be a newer version
-            # but that isn't checked - this could install a version that's already installed
-            target = files[-1] if version is None else version
-            if target not in files:
-                print_log_messages("measures_update can't find specified version %s" % target, logger, True)
-
+                print_log_messages('A measures update has been requested by the force argument', logger, verbose=verbose)
+
+            print_log_messages('  ... finding available measures ...', logger, verbose=verbose)
+
+            target = None
+            site = None
+
+            # if a specific version has been request AND measures_site is a list with more than one value
+            # then find the site with that version in it. Turn off logging in measures_available calls
+            # here as the age of the site doesn't matter
+            if version is not None and isinstance(measures_site, list) and len(measures_site) > 1:
+                target = version
+                for this_site in measures_site:
+                    files = measures_available(measures_site=this_site, logger=None)
+                    # make sure that site is excluded from files before target is checked
+                    files = files[1:]
+                    if target in files:
+                        site = this_site
+                        break
+                if site is None:
+                    print_log_messages("measures_update can't find specfied version %s at any of the sites in the measures_site list" % target, logger, True)
+                # else site and  target are set
             else:
-                # there are files to extract, make sure there's no past measures.ztar from a failed previous install
-                ztarPath = os.path.join(path,'measures.ztar')
-                if os.path.exists(ztarPath):
-                    os.remove(ztarPath)
-    
-                with open(ztarPath, 'wb') as fid:
-                    print_log_messages('  ... downloading %s from ASTRON server to %s ...' % (target, path), logger)
-                    ftp.retrbinary('RETR ' + target, fid.write)
-
-                ftp.close()
-
+                # if measure_available sorts out what site to use if it's a list with more than one element
+                # a specific version probably needs to use a specific site to make it work
+                # if a specific version has been requested then the age of the site isn't an issue, turn logging off
+                this_logger = logger if version is None else None
+                files = measures_available(measures_site=measures_site, logger=this_logger)
+                site = files[0]
+                # this makes sure that the site is exclude from files before target is checked.
+                files = files[1:]
+
+                # target filename to download
+                # for the non-force unspecified version case this can only get here if the age is > 1 day so there should be a newer version
+                # but that isn't checked - this could install a version that's already installed
+                target = files[-1] if version is None else version
+                if target not in files:
+                    print_log_messages("measures_update can't find specified version %s at site %s" % (target,site), logger, True)
+                    # unset site here to signal nothing to extract
+                    site = None
+
+            if site is not None:
+                # there are files to extract
+                print_log_messages('  ... downloading %s from %s to %s ...' % (target, site, path), logger, verbose=verbose)
+
+                # it's at this point that this code starts modifying what's there so the lock file should
+                # not be removed on failure from here on (until it succeeds)
+                clean_lock = False
+                
                 # remove any existing measures readme.txt now in case something goes wrong during extraction
                 readme_path = os.path.join(path,'geodetic/readme.txt')
                 if os.path.exists(readme_path):
                     os.remove(readme_path)
 
-                # extract from the fetched tarfile
-                with tarfile.open(ztarPath, mode='r:gz') as ztar:
-                    # the list of members to extract
-                    x_list = []
-                    for m in ztar.getmembers() :
-                        if force and use_astron_obs_table:
-                            # exclude the *.old names in geodetic
-                           if not(re.search('geodetic',m.name) and re.search('.old',m.name)):
-                                x_list.append(m)
-                        else:
-                            # exclude the Observatories table and  *.old names in geodetic
-                            if not((re.search('geodetic',m.name) and re.search('.old',m.name)) or re.search('Observatories',m.name)):
-                                x_list.append(m)
-
-                    # use the 'data' filter if available, revert to previous 'fully_trusted' behavior of not available
-                    ztar.extraction_filter = getattr(tarfile, 'data_filter', (lambda member, path: member))
-                    ztar.extractall(path=path,members=x_list)
-                    ztar.close()
-
-                os.remove(ztarPath)
+                # custom filter that incorporates 'data_filter' to watch for dangerous members of the tar file
+                # this adds filtering to remove the Observatories table (unless use_astron_obs_table is True) and
+                # the *.old tables that may be in the geodetic tree
+                def custom_filter(member, extractionPath):
+                    # member is a TarInfo instance and extractionPath is the destination path
+                    # use the 'data_filter' first to deal with dangerous members
+                    member = tarfile.data_filter(member, extractionPath)
+                    # always exclude *.old names in geodetic
+                    if (member is not None) and (re.search('geodetic',member.name) and re.search('.old',member.name)):
+                        member = None
+                    # the use_astron_obs_table argumen only has weight if force is True
+                    if (not (force and use_astron_obs_table)) and (member is not None) and (re.search('Observatories',member.name)):
+                        member = None
+                    return member
+
+                # untar the target at site to path using the custom filter, do not be verbose
+                do_untar_url(site, target, path, custom_filter)
 
                 # create a new readme.txt file
                 with open(readme_path,'w') as fid:
-                    fid.write("# measures data populated by casaconfig\nversion : %s\ndate : %s" % (target, datetime.today().strftime('%Y-%m-%d')))
-
-                print_log_messages('  ... measures data updated at %s' % path, logger)
+                    # site added last to not break past readers of the measures readme
+                    fid.write("# measures data populated by casaconfig\nversion : %s\ndate : %s\nsite : %s" % (target, datetime.today().strftime('%Y-%m-%d'),site))
 
                 clean_lock = True
-            
+                print_log_messages('  ... measures data updated at %s' % path, logger, verbose=verbose)
+
             # closing out the do_update
 
         # closing out the try block
@@ -373,6 +418,14 @@ def measures_update(path=None, version=None, force=False, logger=None, auto_upda
         msgs.append('Check for other updates in progress or choose a different path or clear out this path and reinstall the casarundata as well as the measures data')
         print_log_messages(msgs, logger, True)
         raise
+
+    except RemoteError as exc:
+        # probably an empty site
+        msgs = [str(exc)]
+        msgs.append('There was a remote error while attempting to update measures at %s' % path)
+        msgs.append('Check the value of measures_site and try again')
+        print_log_messages(msgs, logger, True)
+        raise
         
     except Exception as exc:
         msgs = []

casaconfig/private/print_log_messages.py

@@ -30,13 +30,17 @@ def print_log_messages(msg, logger, is_err=False, verbose=2):
        - msg (str) - The message to print and optionally log.
        - logger (casatools.logsink) - Instance of the casalogger to use. Not used if None.
        - is_err (bool=False) - When False, output goes to sys.stdout and logged as INFO level. When True, output goes to sys.stderr and logged as SEVERE
-       - verbose (int=2) - When < 2 then msg is only printed if there is no logger, otherwise it's just logged
+       - verbose (int=2) - 0 - do nothing, 1 log unless there is no logger, then print, 2 log and print
 
     Returns
        None
 
     """
 
+    if verbose == 0:
+        # do nothing
+        return
+
     import sys
     fileout = sys.stdout
     loglevel = 'INFO'
@@ -48,8 +52,8 @@ def print_log_messages(msg, logger, is_err=False, verbose=2):
     if type(msg) is not list:
         msg = [msg]
 
-    # always print if there is no logger, if there is a logger and verbose is < 2 then do not print
-    if (logger is None) or (not verbose < 2):
+    # print if there is no logger or verbose >= 2
+    if (logger is None) or (verbose >= 2):
         for m_msg in msg:
             print(m_msg,file=fileout)
 

casaconfig/private/pull_data.py

@@ -22,6 +22,7 @@ def pull_data(path=None, version=None, force=False, logger=None, verbose=None):
     The verbose argument controls the level of information provided when this function when the data
     are unchanged for expected reasons. A level of 0 prints and logs nothing. A
     value of 1 logs the information and a value of 2 logs and prints the information.
+    Error messages are always logged and printed.
 
     The path must either contain a previously installed version of casarundata
     or it must not exist or be empty.
@@ -107,19 +108,23 @@ def pull_data(path=None, version=None, force=False, logger=None, verbose=None):
 
     from casaconfig import data_available
     from casaconfig import get_data_info
-    from casaconfig import UnsetMeasurespath, BadLock, BadReadme, NotWritable
+    from casaconfig import UnsetMeasurespath, BadLock, BadReadme, NoNetwork, NotWritable, RemoteError
 
     from .print_log_messages import print_log_messages
     from .get_data_lock import get_data_lock
     from .do_pull_data import do_pull_data
 
+    from .. import config as _config
+
     if path is None:
-        from .. import config as _config
         path = _config.measurespath
 
     if path is None:
         raise UnsetMeasurespath('path is None and has not been set in config.measurespath. Provide a valid path and retry.')
 
+    if verbose is None:
+        verbose = _config.casaconfig_verbose
+        
     # when a specific version is requested then the measures readme.txt that is part of that version
     # will get a timestamp of now so that default measures updates won't happen for a day unless the
     # force argument is used for measures_update
@@ -223,7 +228,7 @@ def pull_data(path=None, version=None, force=False, logger=None, verbose=None):
     lock_fd = None
     clean_lock = True  # set to False if the contents are actively being update and the lock file should not be cleaned on exception
     try:
-        print_log_messages('pull_data using version %s, acquiring the lock ... ' % version, logger)
+        print_log_messages('pull_data using version %s, acquiring the lock ... ' % version, logger, verbose=verbose)
 
         # attempting to get the lock will raise NoNetwork if there is no network and the lock will not be set, catch and reemit that in this try block
         lock_fd = get_data_lock(path, 'pull_data')
@@ -248,13 +253,13 @@ def pull_data(path=None, version=None, force=False, logger=None, verbose=None):
                             if measuresVersion == expectedMeasuresVersion:
                                 # no pull is necessary
                                 do_pull = False
-                                print_log_messages('pull_data requested "release" versions of casarundata and measures are already installed.', logger)
+                                print_log_messages('pull_data requested "release" versions of casarundata and measures are already installed.', logger, verbose=verbose)
                             # otherwise this is a release pull and even if the measuresVersion is 'unknown' or 'invalid' we should proceed with a pull at this point
                             # problems with casarundata path will have been caught before
                     else:
                         # nothing to do here, already at the expected casarundata version and a pull is not being forced and this is not a release pull
                         do_pull = False
-                        print_log_messages('pull_data requested version is already installed.', logger)
+                        print_log_messages('pull_data requested version is already installed.', logger, verbose=verbose)
 
                 # a version of 'invalid', 'error', or 'unknown' is a surprise here, likely caused by something else doing something
                 # incompatible with this attempt
@@ -274,7 +279,7 @@ def pull_data(path=None, version=None, force=False, logger=None, verbose=None):
         if do_pull:
             # do not clean the lock file contents at this point unless do_pull_data returns normally
             clean_lock = False
-            do_pull_data(path, version, installed_files, currentVersion, currentDate, logger)
+            do_pull_data(path, version, installed_files, currentVersion, currentDate, logger, verbose)
             clean_lock = True
             if namedVersion:
                 # a specific version has been requested, set the times on the measures readme.txt to now to avoid