casaconfig 0.0.80__tar.gz → 0.0.81__tar.gz

{casaconfig-0.0.80/casaconfig.egg-info → casaconfig-0.0.81}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: casaconfig
-Version: 0.0.80
+Version: 0.0.81
 Summary: CASA Operational Configuration Package
 Home-page: https://github.com/casangi/casaconfig
 Author: National Radio Astronomy Observatory

{casaconfig-0.0.80 → casaconfig-0.0.81}/casaconfig/__main__.py

@@ -7,6 +7,8 @@ parser = get_argparser(add_help=True)
 # get_argparser supplies configfile, noconfig, nositeconfig
 # add measurespath, pull-data, data-update, measures-update, update-all, reference-testing, current-data
 
+parser.prog = "casaconfig"
+
 # measurespath will default to the value in config if not set here
 parser.add_argument( "--measurespath", dest='measurespath', default=None,
                      help="location of casarundata")
@@ -23,6 +25,8 @@ parser.add_argument( "--reference-testing", action='store_const', const=True, de
                      help="set measurespath to the casarundata when this version was produced, used for testing purposes")
 parser.add_argument( "--current-data", dest='currentdata', action='store_const', const=True, default=False,
                      help="print out a summary of the current casarundata and measures data installed in measurespath and then exit")
+parser.add_argument("--force", dest='force', action='store_const', const=True, default=False,
+                    help="force an update using the force=True option to update_all, data_update, and measures_update")
 
 # initialize the configuration to be used
 flags,args = parser.parse_known_args(sys.argv)
@@ -65,8 +69,8 @@ if flags.currentdata:
             
         # measures
         measuresInfo = dataInfo['measures']
-        if measuresInfo is None or casarunInfo['version'] == "invalid":
-            print("No measures data found (missing or unexpected readme.txt, not obviously legaca measures data).")
+        if measuresInfo is None or measuresInfo['version'] == "invalid":
+            print("No measures data found (missing or unexpected readme.txt, not obviously legacy measures data).")
         elif measuresInfo['version'] == "unknown":
             print("measures version is unknown (probably legacy measures data not maintained by casaconfig).")
         else:
@@ -83,17 +87,18 @@ else:
         # ignore all other options
     else:
         # the update options, update all does everything, no need to invoke anything else
+        print("Checking for updates into %s" % measurespath)
         if flags.updateall:
-            casaconfig.update_all(measurespath)
+            casaconfig.update_all(measurespath,force=flags.force)
         else:
             # do any pull_update first
             if flags.pulldata:
                 casaconfig.pull_data(measurespath)
             # then data_update, not necessary if pull_data just happened
             if flags.dataupdate and not flags.pulldata:
-                casaconfig.data_update(measurespath)
+                casaconfig.data_update(measurespath, force=flags.force)
             # then measures_update
             if flags.measuresupdate:
-                casaconfig.measures_update(measurespath)
+                casaconfig.measures_update(measurespath, force=flags.force)
 
 sys.exit(0)

{casaconfig-0.0.80 → casaconfig-0.0.81}/casaconfig/config.py

@@ -124,14 +124,9 @@ for __v in __defaults:
             if globals()[__v] is not None:
                 globals()[__v] = __os.path.abspath(__os.path.expanduser(globals()[__v]))
             else:
-                # debugging for now
-                print("None value seen while expanding path-like fields for config parameter %s" % __v)
-                print("__loaded_config_files : ")
-                for __f in __loaded_config_files:
-                    print("   %s" % __f)
-                print("__config_files : ")
-                for __f in __config_files:
-                    print("  %s" % __f)
+                pass
+                # debugging
+                # print("None value seen while expanding path-like fields for config parameter %s" % __v)
                 
 def load_success( ):
     return __loaded_config_files

{casaconfig-0.0.80 → casaconfig-0.0.81}/casaconfig/private/data_update.py

@@ -20,6 +20,8 @@ def data_update(path=None, version=None, force=False, logger=None, auto_update_r
     Check for updates to the installed casarundata and install the update or change to 
     the requested version when appropriate.
 
+    If no update is necessary then this function will silently return.
+
     The path must contain a previously installed version of casarundata.
     Use pull_data to install casarundata into a new path (empty or does not exist).
     
@@ -108,6 +110,7 @@ def data_update(path=None, version=None, force=False, logger=None, auto_update_r
     from .data_available import data_available
     from .print_log_messages import print_log_messages
     from .get_data_lock import get_data_lock
+    from .pull_data import pull_data
     from .do_pull_data import do_pull_data
     from .get_data_info import get_data_info
 
@@ -120,6 +123,11 @@ def data_update(path=None, version=None, force=False, logger=None, auto_update_r
         print_log_messages('path is None and has not been set in config.measurespath (probably casasiteconfig.py). Provide a valid path and retry.', logger, True)
         return
 
+    # 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
+    namedVersion = version is not None
+
     path = os.path.expanduser(path)
     readme_path = os.path.join(path, 'readme.txt')
 
@@ -131,12 +139,19 @@ def data_update(path=None, version=None, force=False, logger=None, auto_update_r
             print_log_messages('force must be False when auto_update_rules is True', logger, True)
             return
         if (not os.path.isdir(path)) or (os.stat(path).st_uid != os.getuid()):
-            print_log_messages('path must exist as a directory and it must be owned by the user when auto_update_rules is True', logger, True)
+            msgs = []
+            msgs.append("Warning: path must exist as a directory and it must be owned by the user, path = %s" % path)
+            msgs.append("Warning: no data updates are possible on this path by this user.")
+            print_log_messages(msgs, logger, False)
             return        
 
     if not os.path.exists(readme_path):
-        print_log_messages('No readme.txt file found at path. Nothing updated or checked.', logger, True);
-        return
+        # path must exist and it must be empty in order to continue
+        if not os.path.exists(path) or (len(os.listdir(path)) > 0):
+            print_log_messages('No readme.txt file found at path. Nothing updated or checked.', logger, True);
+            return
+        # ok to install a fresh copy, use pull_data directly
+        return pull_data(path,version,force,logger)
 
     # path must be writable with execute bit set
     if (not os.access(path, os.W_OK | os.X_OK)) :
@@ -153,8 +168,10 @@ def data_update(path=None, version=None, force=False, logger=None, auto_update_r
     dataReadmeInfo = get_data_info(path, logger, type='casarundata')
     
     if dataReadmeInfo is None or dataReadmeInfo['version'] == 'invalid':
-        print_log_messages('The readme.txt file at path could not be read as expected', logger, True)
-        print_log_messages('choose a different path or empty this  path and try again using pull_data', logger, True)
+        msgs = []
+        msgs.append('The readme.txt file at path could not be read as expected')
+        msgs.append('choose a different path or empty this  path and try again using pull_data')
+        print_log_messages(msgs, logger, True)
         # no lock has been set yet, safe to simply return here
         return
 
@@ -165,20 +182,25 @@ def data_update(path=None, version=None, force=False, logger=None, auto_update_r
         ageRecent = dataReadmeInfo['age'] < 1.0
 
     if currentVersion is 'unknown':
-        print_log_messages('The data update path appears to be casarundata but no readme.txt file was found', logger, False)
-        print_log_messages('A data update is not possible but CASA use of this data may be OK.', logger, False)
-        print_log_messages('casaconfig must first install the casarundata in path for data_update to run as expected on that path', logger, False)
+        msgs = []
+        msgs.append('The data update path appears to be casarundata but no readme.txt file was found')
+        msgs.append('A data update is not possible but CASA use of this data may be OK.')
+        msgs.append('casaconfig must first install the casarundata in path for data_update to run as expected on that path')
+        print_log_messages(msgs, logger, True)
 
     if (len(installed_files) == 0):
         # this shouldn't happen
-        print_log_messages('The readme.txt file at path did not contain the expected list of installed files', logger, True)
-        print_log_messages('choose a different path or empty this path and try again using pull_data', logger, True)
+        msgs = []
+        msgs.append('The readme.txt file at path did not contain the expected list of installed files')
+        msgs.append('choose a different path or empty this path and try again using pull_data')
+        print_log_messages(msgs, logger, True)
         # no lock has been set yet, safe to simply return here
         return
 
     if version is None and force is False and ageRecent:
         # if version is None, the readme is less than 1 day old  and force is False then return without checking for any newer versions
-        print_log_messages('data_update latest version checked recently in %s, using version %s' % (path, currentVersion), logger)
+        # normal use is silent, this line is useful during debugging
+        # print_log_messages('data_update latest version checked recently in %s, using version %s' % (path, currentVersion), logger)
         # no lock has been set yet, safe to simply return here
         return
 
@@ -195,7 +217,7 @@ def data_update(path=None, version=None, force=False, logger=None, auto_update_r
         # use the release version from get_data_info
         releaseInfo = get_data_info()['release']
         if releaseInfo is None:
-            print_log_messages('No release info found, pull_data can not continue', logger, True)
+            print_log_messages('No release info found, data_update can not continue', logger, True)
             return
         requestedVersion = releaseInfo['casarundata']
         expectedMeasuresVersion = releaseInfo['measures']
@@ -218,17 +240,20 @@ def data_update(path=None, version=None, force=False, logger=None, auto_update_r
                     force = False
                 # if measuresReadmeInfo is None then that's a problem and force remains True, this also catches 'invalid' and 'unknown' measures versions, which should not happen here
             if not force:
-                print_log_messages('data_update requested "release" version of casarundata and measures are already installed.', logger)
+                # normal use is silent, this line is useful during debugging
+                # print_log_messages('data_update requested "release" version of casarundata and measures are already installed.', logger)
                 # no lock has been set yet, safe to simply return here
                 return
         else:
             # normal usage, ok to return now
+            # normal use is silent, commented out lines are useful during debugging
             if latestVersion:
-                print_log_messages('The latest version is already installed in %s, using version %s' % (path, currentVersion), logger)
+                # print_log_messages('The latest version is already installed in %s, using version %s' % (path, currentVersion), logger)
                 # touch the dates of the readme to prevent a future check on available data for the next 24 hours
                 os.utime(readme_path)
-            else:
-                print_log_messages('Requested casarundata is installed in %s, using version %s' % (path, currentVersion), logger)
+             #else:
+                # print_log_messages('Requested casarundata is installed in %s, using version %s' % (path, currentVersion), logger)
+                
             # no lock has been set yet, safe to simply return here
             return
 
@@ -241,10 +266,12 @@ def data_update(path=None, version=None, force=False, logger=None, auto_update_r
         lock_fd = get_data_lock(path, 'data_update')
         # if lock_fd is None it means the lock file was not empty - because we know that path exists at this point
         if lock_fd is None:
-            print_log_messages('The lock file at %s is not empty.' % path, logger, True)
-            print_log_messages('A previous attempt to update path may have failed or exited prematurely.', logger, True)
-            print_log_messages('Remove the lock file and set force to True with the desired version (default to most recent).', logger, True)
-            print_log_messages('It may be best to completely repopulate path using pull_data and measures_update.', logger, True)
+            msgs = []
+            msgs.append('The lock file at %s is not empty.' % path)
+            msgs.append('A previous attempt to update path may have failed or exited prematurely.')
+            msgs.append('Remove the lock file and set force to True with the desired version (default to most recent).')
+            msgs.append('It may be best to completely repopulate path using pull_data and measures_update.')
+            print_log_messages(msgs, logger, True)
             return
 
         do_update = True
@@ -281,25 +308,36 @@ def data_update(path=None, version=None, force=False, logger=None, auto_update_r
                 if len(installed_files) == 0:
                     # this shouldn't happen, do not do an update
                     do_update = False
-                    print_log_messages('The readme.txt file read at path did not contain the expected list of installed files', logger, True)
-                    print_log_messages('This should not happen unless multiple sessions are trying to update data at the same time and one experienced problems or was done out of sequence', logger, True)
-                    print_log_messages('Check for other updates in process or choose a different path or clear out this path and try again using pull_data or update_all', logger, True)
+                    msgs = []
+                    msgs.append('The readme.txt file read at path did not contain the expected list of installed files')
+                    msgs.append('This should not happen unless multiple sessions are trying to update data at the same time and one experienced problems or was done out of sequence')
+                    msgs.append('Check for other updates in process or choose a different path or clear out this path and try again using pull_data or update_all')
+                    print_log_messages(msgs, logger, True)
         else:
             # this shouldn't happen, do not do an update
             do_update = False
-            print_log_messages('Unexpected problem reading readme.txt file during data_update, can not safely update to the requested version', logger, True)
-            print_log_messages('This should not happen unless multiple sessions are trying to update at the same time and one experienced problems or was done out of sequence', logger, True)
-            print_log_messages('Check for other updates in process or choose a different path or clear out this path and try again using pull_data or update_all', logger, True)
+            msgs = []
+            msgs.append('Unexpected problem reading readme.txt file during data_update, can not safely update to the requested version')
+            msgs.append('This should not happen unless multiple sessions are trying to update at the same time and one experienced problems or was done out of sequence')
+            msgs.append('Check for other updates in process or choose a different path or clear out this path and try again using pull_data or update_all')
+            print_log_messages(msgs, logger, True)
 
         if do_update:
             do_pull_data(path, requestedVersion, installed_files, currentVersion, currentDate, logger)
+            if namedVersion is not None:
+                # a specific version has been requested, set the times on the measures readme.txt to now to avoid
+                # a default update of the measures data without using the force argument
+                measuresReadmePath = os.path.join(path,'geodetic/readme.txt')
+                os.utime(measuresReadmePath)
 
         # truncate the lock file
         lock_fd.truncate(0)
 
     except Exception as exc:
-        print_log_messages('ERROR! : Unexpected exception while populating casarundata version %s to %s' % (requestedVersion, path), logger, True)
-        print_log_messages('ERROR! : %s' % exc, logger, True)
+        msgs = []
+        msgs.append('ERROR! : Unexpected exception while populating casarundata version %s to %s' % (requestedVersion, path))
+        msgs.append('ERROR! : %s' % exc)
+        print_log_messages(msgs, logger, True)
         # leave the contents of the lock file as is to aid in debugging
         # import traceback
         # traceback.print_exc()

{casaconfig-0.0.80 → casaconfig-0.0.81}/casaconfig/private/do_auto_updates.py

@@ -45,20 +45,23 @@ def do_auto_updates(configDict, logger=None):
     from .print_log_messages import print_log_messages
     from .data_update import data_update
     from .measures_update import measures_update
-    
+
     if configDict.measurespath is None:
         # likely still unset in casasiteconfig.py, suggest setting it in ~/.casa/config.py
         # or ask the site administrator (which may be the user) to edit casasiteconfig.py
         # point at the documentation
         # continue, because things still might work if there are measures in datapath
-        print_log_messages('measurespath is None in config', logger, True)
-        print_log_messages('this likely means a casasiteconfig.py was used and measurespath remains unset there.', logger, True)
-        print_log_messages('Either set measurespath in your config file at ~/.casa/config.py', logger, True)
-        print_log_messages('or ask the site manager to set that in casasiteconfig.py', logger, True)
-        print_log_messages('visit https://casadocs.readthedocs.io/en/stable/notebooks/external-data.html for more information', logger, True)
+        msgs = []
+        msgs.append('measurespath is None in config')
+        msgs.append('this likely means a casasiteconfig.py was used and measurespath remains unset there.')
+        msgs.append('Either set measurespath in your config file at ~/.casa/config.py')
+        msgs.append('or ask the site manager to set that in casasiteconfig.py')
+        msgs.append('visit https://casadocs.readthedocs.io/en/stable/notebooks/external-data.html for more information')
 
         if (configDict.measures_auto_update or configDict.data_auto_update):
-            print('\nAuto updates of measures path are not possible because measurespath is not set, skipping auto updates', logger, True)
+            msgs.append('Auto updates of measures path are not possible because measurespath is not set, skipping auto updates')
+
+        print_log_messages(msgs, logger, True)
 
         return
 

{casaconfig-0.0.80 → casaconfig-0.0.81}/casaconfig/private/measures_update.py

@@ -15,12 +15,14 @@
 this module will be included in the api
 """
 
-def measures_update(path=None, version=None, force=False, logger=None, auto_update_rules=False):
+def measures_update(path=None, version=None, force=False, logger=None, auto_update_rules=False, use_astron_obs_table=False):
     """
-    Retrieve IERS data used for measures calculations from the ASTRON server
+    Update or install the IERS data used for measures calculations from the ASTRON server at path.
     
     Original data source used by ASTRON is here: https://www.iers.org/IERS/EN/DataProducts/data.html
 
+    If no update is necessary then this function will silently return.
+
     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
     is not installed by measures_update and any Observatories file at path will not be changed
@@ -35,9 +37,12 @@ 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. This
-    limits the number of attempts to update the measures data (including checking for more recent
-    data) to once per day.
+    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.
 
     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 
@@ -121,6 +126,7 @@ def measures_update(path=None, version=None, force=False, logger=None, auto_upda
     from .print_log_messages import print_log_messages
     from .get_data_lock import get_data_lock
     from .get_data_info import get_data_info
+    from .measures_available import measures_available
     
     if path is None:
         from .. import config as _config
@@ -141,7 +147,10 @@ def measures_update(path=None, version=None, force=False, logger=None, auto_upda
             print_log_messages('force must be False when auto_update_rules is True', logger, True)
             return
         if (not os.path.isdir(path)) or (os.stat(path).st_uid != os.getuid()):
-            print_log_messages('path must exist as a directory and it must be owned by the user when auto_update_rules is True', logger, True)
+            msgs = []
+            msgs.append("Warning: path must exist as a directory and it must be owned by the user, path = %s" % path)
+            msgs.append("Warning: no measures auto update is possible on this path by this user.")
+            print_log_messages(msgs, logger, False)
             return
     
     if not os.path.exists(path):
@@ -161,19 +170,15 @@ def measures_update(path=None, version=None, force=False, logger=None, auto_upda
             ageRecent = readmeInfo['age'] < 1.0
 
     if not force:
-        # don't re-download the same data
-        if (version is not None) and (version == current):
-            print_log_messages('measures_update requested version already installed in %s' % path, logger)
-            return
-        
         # don't check for new version if the age is less than 1 day
         if version is None and ageRecent:
-            print_log_messages('measures_update latest version checked recently in %s, using version %s' % (path, current), logger)
+            # normal use is silent, this line is useful during debugging
+            # print_log_messages('measures_update latest version checked recently in %s, using version %s' % (path, current), logger)
             return
         
         # don't overwrite something that looks bad unless forced to do so
         if current == 'invalid':
-            print_log_messages('the measures readme.txt file could not be read as expected, an update can not proceed unless force is True', logger, True)
+            print_log_messages('The measures readme.txt file could not be read as expected, an update can not proceed unless force is True', logger, True)
             return
 
         # don't overwrite something that looks like valid measures data unless forced to do so
@@ -181,6 +186,38 @@ def measures_update(path=None, version=None, force=False, logger=None, auto_upda
             print_log_messages('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]
+            except:
+                # unsure what happened, leave it at none, which will trigger an update attempt, which might work
+                pass
+
+        # don't re-download the same data
+        if (checkVersion is not None) and (checkVersion == current):
+            # normal use is silent, this line is useful during debugging
+            # print_log_messages('measures_update requested version already installed in %s' % path, logger)
+            # update the age of the readme to now
+            try:
+                readme_path = os.path.join(path,'geodetic/readme.txt')
+                # readme_path should already exist if it's here
+                os.utime(readme_path)
+            except:
+                # unsure what happened, everything otherwise is fine if we got here, ignore this error
+                pass
+            
+            return
+
+        # don't do anything unless the Observatories table is already installed as expected
+        obsTabPath = os.path.join(path,'geodetic/Observatories')
+        if not os.path.isdir(obsTabPath):
+            print("Error: the Observatories table was not found as expected in %s" % path, logger, True)
+            print("Either install casarundata first or set use_astron_obs_table and force to be True when using measures_update.", logger, True)
+            print("Note that the Observatories table provided in the Astron measures tarfile is not the same as that maintained by CASA", logger, True)
+            return
+        
     # path must be writable with execute bit set
     if (not os.access(path, os.W_OK | os.X_OK)) :
         print_log_messages('No permission to write to the measures path, cannot update : %s' % path, logger, True)
@@ -191,15 +228,18 @@ def measures_update(path=None, version=None, force=False, logger=None, auto_upda
     # lock the measures_update.lock file
     lock_fd = None
     try:
-        print_log_messages('measures_update measures need to be updated, acquiring the lock ... ', logger)
+        print_log_messages('measures_update ... acquiring the lock ... ', logger)
 
         lock_fd = get_data_lock(path, 'measures_update')
         # if lock_fd is None it means the lock file was not empty - because we know that path exists at this point
         if lock_fd is None:
-            print_log_messages('The lock file at %s is not empty.' % path, logger, True)
-            print_log_messages('A previous attempt to update path may have failed or exited prematurely.', logger, True)
-            print_log_messages('Remove the lock file and set force to True with the desired version (default to most recent).', logger, True)
-            print_log_messages('It may be best to completely repopulate path using pull_data and measures_update.', logger, True)
+            # using a list of messages results in a better printing if the logger is redirected to the terminal
+            msgs = []
+            msgs.append('The lock file at %s is not empty.' % path)
+            msgs.append('A previous attempt to update path may have failed or exited prematurely.')
+            msgs.append('Remove the lock file and set force to True with the desired version (default to most recent).')
+            msgs.append('It may be best to completely repopulate path using pull_data and measures_update.')
+            print_log_messages(msgs, logger, True)
             return
 
         do_update = force
@@ -216,18 +256,21 @@ def measures_update(path=None, version=None, force=False, logger=None, auto_upda
                     ageRecent = readmeInfo['age'] < 1.0
 
             if (version is not None) and (version == current):
-                # no update will be done, version is as requested
-                print_log_messages('measures_update requested measures version detected in %s, using version %s' % (path, current), logger)
+                # no update will be done, version is as requested - not silent 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)
             elif (version is None) and ageRecent:
-                # no update will be done, it's already been checked or updated recently
-                print_log_messages('measures_update latest measures version checked recently in %s, using version %s' % (path, current), logger)
+                # no update will be done, it's already been checked or updated recently - not silent 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)
             else:
                 # final check for problems before updating
                 if not force and readmeInfo is not None and (version=='invalid' or version=='unknown'):
                     # at this point, this indicates something is unexpectedly wrong, do not continue
-                    print_log_messages('Something unexpected has changed in the measures path location, and measures_update can not continue', logger, True)
-                    print_log_messages('a previous measures_update may have exited unexpectedly', logger, True)
-                    print_log_messages('It may be necessary to reinstall the casarundata as well as the measures data if %s is the correct path' % path, logger, True)
+                    # using a list of messages results in a better printing if the logger is redirected to the terminal
+                    msgs = []
+                    msgs.append('Something unexpected has changed in the measures path location, and measures_update can not continue')
+                    msgs.append('A previous measures_update may have exited unexpectedly')
+                    msgs.append('It may be necessary to reinstall the casarundata as well as the measures data if %s is the correct path' % path)
+                    print_log_messages(msgs, logger, True)
                     # update is already turned off, the lock file will be cleaned up on exit
                 else:
                     # an update is needed
@@ -235,9 +278,9 @@ def measures_update(path=None, version=None, force=False, logger=None, auto_upda
 
         if do_update:
             if force:
-                print_log_messages('meaures_update a measures update has been requested by the force argument', logger)
+                print_log_messages('A measures update has been requested by the force argument', logger)
 
-            print_log_messages('measures_update connecting to ftp.astron.nl ...', logger)
+            print_log_messages(' ... connecting to ftp.astron.nl ...', logger)
 
             ftp = FTP('ftp.astron.nl')
             rc = ftp.login()
@@ -252,38 +295,48 @@ def measures_update(path=None, version=None, force=False, logger=None, auto_upda
                 print_log_messages('measures_update cant find specified version %s' % target, logger, True)
 
             else:
-                # there are files to extract, remove the readme.txt file in case this dies unexpectedly
-                readme_path = os.path.join(path,'geodetic/readme.txt')
-                if os.path.exists(readme_path):
-                    os.remove(readme_path)
+                # 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(os.path.join(path,'measures.ztar'), 'wb') as fid:
-                    print_log_messages('measures_update downloading %s from ASTRON server to %s ...' % (target, path), logger)
+                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()
-    
+
+                # 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(os.path.join(path,'measures.ztar'),mode='r:gz') as ztar:
+                with tarfile.open(ztarPath, mode='r:gz') as ztar:
                     # the list of members to extract
                     x_list = []
                     for m in ztar.getmembers() :
-                        # always 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)
+                        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.system("rm %s" % os.path.join(path, 'measures.ztar'))
+                os.remove(ztarPath)
 
-                # update the readme.txt file
+                # 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_update updated measures data at %s' % path, logger)
+                print_log_messages('  ... measures data update at %s' % path, logger)
             
             # closing out the do_update
 
@@ -292,8 +345,10 @@ def measures_update(path=None, version=None, force=False, logger=None, auto_upda
         lock_fd.truncate(0)
         
     except Exception as exc:
-        print_log_messages("ERROR! : Unexpected exception while updating measures at %s" % path, logger, True)
-        print_log_messages("ERROR! : %s" % exc, logger, True)
+        msgs = []
+        msgs.append("ERROR! : Unexpected exception while updating measures at %s" % path)
+        msgs.append("ERROR! : %s" % exc)
+        print_log_messages(msgs, logger, True)
         # leave the contents of the lock file as is to aid in debugging
         
     # if the lock file is not closed, do that now to release the lock

{casaconfig-0.0.80 → casaconfig-0.0.81}/casaconfig/private/print_log_messages.py

@@ -16,6 +16,8 @@ def print_log_messages(msg, logger, is_err=False):
     """
     Print msg and optionally write it to an instance of the casalogger.
 
+    If msg is a list then the elements are each printed first followed by logging each element.
+
     Messages are normally printed to sys.stdout and logged as INFO to the casalogger.
     
     When is_err is True the message is printed sys.stderr and logged as SEVERE
@@ -39,5 +41,12 @@ def print_log_messages(msg, logger, is_err=False):
         fileout = sys.stderr
         loglevel = 'SEVERE'
 
-    print(msg,file=fileout)
-    if logger is not None: logger.post(msg, loglevel)
+    # this is rarely called and this should be a fast operation, it makes the code simpler
+    if type(msg) is not list:
+        msg = [msg]
+
+    for m_msg in msg:
+        print(m_msg,file=fileout)
+
+    for m_msg in msg:
+        if logger is not None: logger.post(m_msg, loglevel)

{casaconfig-0.0.80 → casaconfig-0.0.81}/casaconfig/private/pull_data.py

@@ -107,6 +107,11 @@ def pull_data(path=None, version=None, force=False, logger=None):
         print_log_messages('path is None and has not been set in config.measurespath (probably casasiteconfig.py). Provide a valid path and retry.', logger, True)
         return
 
+    # 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
+    namedVersion = version is not None
+
     path = os.path.expanduser(path)
     readme_path = os.path.join(path, 'readme.txt')
 
@@ -125,26 +130,30 @@ def pull_data(path=None, version=None, force=False, logger=None):
         installed_files = readmeInfo['manifest']
 
         if currentVersion == 'invalid':
-            print_log_messages('destination path is not empty and this does not appear to be casarundata OR the readme.txt file found there could not be read as expected', logger, True)
-            print_log_messages('choose a different path or empty this path and try again', logger, True)
+            msgs = []
+            msgs.append('destination path is not empty and this does not appear to be casarundata OR the readme.txt file found there could not be read as expected')
+            msgs.append('choose a different path or empty this path and try again')
+            print_log_messages(msgs, logger, True)
             # no lock has been set yet, safe to simply return here
             return
 
         if currentVersion == 'unknown':
-            print_log_messages('destination path appears to be casarundata but no readme.txt file was found', logger, False)
-            print_log_messages('no data will be installed but CASA use of this data may be OK. Choose a different path or delete this path to install new casarundata.', logger, False)
+            msgs = []
+            msgs.append('destination path appears to be casarundata but no readme.txt file was found')
+            msgs.append('no data will be installed but CASA use of this data may be OK. Choose a different path or delete this path to install new casarundata.')
             if force:
-                print_log_messages('force is True but there is no readme.txt found and the location is not empty, no data will be installed', logger, True)
-                print_log_messages('Choose a different path or empty this path to install new casarundata', logger, True)
+                msgs.append('force is True but there is no readme.txt found and the location is not empty, no data will be installed')
+                msgs.append('Choose a different path or empty this path to install new casarundata')
+            print_log_messages(msgs, logger, True)
             # no lock as been set yet, safe to simply return here
             return
 
         if (installed_files is None or len(installed_files) == 0):
             # this shouldn't happen
-            print('')
-            print_log_messages('destination path is not empty and the readme.txt file found there did not contain the expected list of installed files', logger, True)
-            print_log_messages('choose a different path or empty this path and try again', logger, True)
-            print('')
+            msgs = []
+            msgs.append('destination path is not empty and the readme.txt file found there did not contain the expected list of installed files')
+            msgs.append('choose a different path or empty this path and try again')
+            print_log_messages(msgs, logger, True)
             # no lock as been set yet, safe to simply return here
             return
             
@@ -196,12 +205,12 @@ def pull_data(path=None, version=None, force=False, logger=None):
         lock_fd = get_data_lock(path, 'pull_data')
         # if lock_fd is None it means the lock file was not empty - because we know that path exists at this point
         if lock_fd is None:
-            print('')
-            print_log_messages('The lock file at %s is not empty.' % path, logger, True)
-            print_log_messages('A previous attempt to update path may have failed or exited prematurely.', logger, True)
-            print_log_messages('Remove the lock file and set force to True with the desired version (default to the most recent).', logger, True)
-            print_log_messages('It may be best to clean out that location and do a fresh pull_data.', logger, True)
-            print('')
+            msgs = []
+            msgs.append('The lock file at %s is not empty.' % path)
+            msgs.append('A previous attempt to update path may have failed or exited prematurely.')
+            msgs.append('Remove the lock file and set force to True with the desired version (default to the most recent).')
+            msgs.append('It may be best to clean out that location and do a fresh pull_data.')
+            print_log_messages(msgs, logger, True)
             return
         
         do_pull = True
@@ -238,10 +247,10 @@ def pull_data(path=None, version=None, force=False, logger=None):
                 # incompatible with this attempt
                 if version in ['invalid','error','unknown']:
                     do_pull = False
-                    print('')
-                    print_log_messages('Unexpected version or problem found in readme.txt file during pull_data, can not safely pull the requested version', logger, True)
-                    print_log_messages('This should not happen unless multiple sessions are trying to pull_data at the same time and one experienced problems or was done out of sequence', logger, True)
-                    print('')
+                    msgs = []
+                    msgs.append('Unexpected version or problem found in readme.txt file during pull_data, can not safely pull the requested version')
+                    msgs.append('This should not happen unless multiple sessions are trying to pull_data at the same time and one experienced problems or was done out of sequence')
+                    print_log_messages(msgs, logger, True)
                     
 
                 if do_pull:
@@ -250,23 +259,28 @@ def pull_data(path=None, version=None, force=False, logger=None):
                     if len(installed_files) == 0:
                         # this shoudn't happen, do not do a pull
                         do_pull = False
-                        print('')
-                        print_log_messages('destination path is not empty and the readme.txt file found there did not contain the expected list of installed files', logger, True)
-                        print_log_messages('This should not happen unless multiple sessions are trying to pull_data at the same time and one experienced problems or was done out of sequence', logger, True)
-                        print_log_messages('Check for other updates in process or choose a different path or clear out this path and try again', logger, True)
-                        print('')
+                        msgs = []
+                        msgs.append('destination path is not empty and the readme.txt file found there did not contain the expected list of installed files')
+                        msgs.append('This should not happen unless multiple sessions are trying to pull_data at the same time and one experienced problems or was done out of sequence')
+                        msgs.append('Check for other updates in process or choose a different path or clear out this path and try again')
+                        print_log_messages(msgs, logger, True)
 
         if do_pull:
             do_pull_data(path, version, installed_files, currentVersion, currentDate, logger)
+            if namedVersion:
+                # a specific version has been requested, set the times on the measures readme.txt to now to avoid
+                # a default update of the measures data without using the force argument
+                measuresReadmePath = os.path.join(path,'geodetic/readme.txt')
+                os.utime(measuresReadmePath)
                         
-        # truncate the lock file
+        # truncate the lock filed
         lock_fd.truncate(0)
         
     except Exception as exc:
-        print('')
-        print_log_messages('ERROR! : Unexpected exception while populating casarundata version %s to %s' % (version, path), logger, True)
-        print_log_messages('ERROR! : %s' % exc, logger, True)
-        print()
+        msgs = []
+        msgs.append('ERROR! : Unexpected exception while populating casarundata version %s to %s' % (version, path))
+        msgs.append('ERROR! : %s' % exc)
+        print_log_messages(msgs, logger, True)
         # leave the contents of the lock file as is to aid in debugging
         # import traceback
         # traceback.print_exc()

{casaconfig-0.0.80 → casaconfig-0.0.81}/casaconfig/private/update_all.py

@@ -15,7 +15,7 @@
 this module will be included in the api
 """
 
-def update_all(path=None, logger=None):
+def update_all(path=None, logger=None, force=False):
     """
     Update the data contants at path to the most recently released versions
     of casarundata and measures data. 
@@ -33,6 +33,8 @@ def update_all(path=None, logger=None):
     If path already contains the most recent versions of casarundata and 
     measurespath then nothing will change at path.
 
+    The force argument is passed to data_update and measures_update
+
     This uses pull_data, data_update and measures_update. See the
     documentation for those functions for additional details.
 
@@ -76,7 +78,10 @@ def update_all(path=None, logger=None):
     # path must be a directory and it must be owned by the user
     
     if (not os.path.isdir(path)) or (os.stat(path).st_uid != os.getuid()):
-        print_log_messages("path must exist as a directory and it must be owned by the user, path = %s" % path, logger, True)
+        msgs = []
+        msgs.append("Warning: path must exist as a directory and it must be owned by the user, path = %s" % path)
+        msgs.append("Warning: no updates are possible on this path by this user.")
+        print_log_messages(msgs, logger, False)
         return
 
     # if path is empty, first use pull_data
@@ -106,7 +111,7 @@ def update_all(path=None, logger=None):
         return
 
     # the updates should work now
-    data_update(path, logger)
-    measures_update(path, logger)
+    data_update(path, logger, force=force)
+    measures_update(path, logger, force=force)
 
     return

{casaconfig-0.0.80 → casaconfig-0.0.81/casaconfig.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: casaconfig
-Version: 0.0.80
+Version: 0.0.81
 Summary: CASA Operational Configuration Package
 Home-page: https://github.com/casangi/casaconfig
 Author: National Radio Astronomy Observatory

{casaconfig-0.0.80 → casaconfig-0.0.81}/setup.py

@@ -6,7 +6,7 @@ with open('README.md', "r") as fid:   #encoding='utf-8'
 
 setup(
     name='casaconfig',
-    version='0.0.80',
+    version='0.0.81',
     description='CASA Operational Configuration Package',
     long_description=long_description,
     long_description_content_type="text/markdown",