casaconfig 0.0.73__tar.gz → 0.0.75__tar.gz

{casaconfig-0.0.73/casaconfig.egg-info → casaconfig-0.0.75}/PKG-INFO

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

{casaconfig-0.0.73 → casaconfig-0.0.75}/casaconfig/__main__.py

@@ -41,17 +41,17 @@ if flags.measurespath is None:
     print("Either provide a measurespath on the casaconfig command line or edit casasiteconfig.py or other a user config.py to set measurespath to a location.")
     sys.exit(1)
 
-# do any expanduser and abspath
+# do any expanduser and abspath - this is what should be used
 measurespath = os.path.abspath(os.path.expanduser(flags.measurespath))
 
 if flags.currentdata:
     if not os.path.exists(measurespath) or not os.path.isdir(measurespath):
-        print("No data installed at %s. The measurespath does not exist or is not a directory." % flags.measurespath)
+        print("No data installed at %s. The measurespath does not exist or is not a directory." % measurespath)
     else:
         # casarundata
         datareadme = os.path.join(measurespath,'readme.txt')
         if not os.path.exists(datareadme):
-            print("No casarundata installed in %s (missing readme.txt)." % flags.measurespath)
+            print("No casarundata installed in %s (missing readme.txt)." % measurespath)
         else:
             try:
                 with open(datareadme, 'r') as fid:
@@ -60,14 +60,14 @@ if flags.currentdata:
                     currentDate = readme[2].split(':')[1].strip()
                     print('casarundata version %s installed on %s' % (currentVersion, currentDate))
                     if (len(readme)<4):
-                        print('    casarundata appears to be too short, missing list of installed files, casarundata should be repopulated in %s' % flags.measurespath)
+                        print('    casarundata appears to be too short, missing list of installed files, casarundata should be repopulated in %s' % measurespath)
             except:
-                print('There was a problem reading the casarundata readme.txt, casarundata should be repopulated in %s' % flags.measurespath)
+                print('There was a problem reading the casarundata readme.txt, casarundata should be repopulated in %s' % measurespath)
                 
         # measures
         measuresreadme = os.path.join(measurespath,'geodetic/readme.txt')
         if not os.path.exists(measuresreadme):
-            print("No measures data installed in %s/geodetic (missing readme.txt)." % flags.measurespath)
+            print("No measures data installed in %s/geodetic (missing readme.txt)." % measurespath)
         else:
             try:
                 with open(measuresreadme, 'r') as fid:
@@ -76,32 +76,32 @@ if flags.currentdata:
                     currentDate = readme[2].split(':')[1].strip()
                     print('measures version %s installed on %s' % (currentVersion, currentDate))
             except:
-                print('There was a problem reading the measures readme.txt, measures should be repopulated in %s' % flags.measurespath)
+                print('There was a problem reading the measures readme.txt, measures should be repopulated in %s' % measurespath)
  
     # ignore any other arguments
 
 else:
     if flags.referencetesting:
-        print("--reference-testing is not yet implemented, measurespath=%s" % flags.measurespath)
-        # ignore any other arguments
-        
+        print("reference testing using pull_data and 'release' version into %s" % measurespath)
+        casaconfig.pull_data(measurespath,'release')
+        # ignore all other options
     else:
         # the update options, update all does everything, no need to invoke anything else
         if flags.updateall:
-            print("data_update then measures_update using path=%s" % flags.measurespath)
-            casaconfig.update_all(flags.measurespath)
+            print("data_update then measures_update using path=%s" % measurespath)
+            casaconfig.update_all(measurespath)
         else:
             # do any pull_update first
             if flags.pulldata:
-                print("pull_data using path=%s" % flags.measurespath)
-                casaconfig.pull_data(flags.measurespath)
+                print("pull_data using path=%s" % measurespath)
+                casaconfig.pull_data(measurespath)
             # then data_update, not necessary if pull_data just happened
             if flags.dataupdate and not flags.pulldata:
-                print("data_update using path=%s" % flags.measurespath)
-                casaconfig.data_update(flags.measurespath)
+                print("data_update using path=%s" % measurespath)
+                casaconfig.data_update(measurespath)
             # then measures_update
             if flags.measuresupdate:
-                print("measures_update using path=%s" % flags.measurespath)
-                casaconfig.measures_update(flags.measurespath)
+                print("measures_update using path=%s" % measurespath)
+                casaconfig.measures_update(measurespath)
 
 sys.exit(0)

{casaconfig-0.0.73 → casaconfig-0.0.75}/casaconfig/config.py

@@ -46,7 +46,7 @@ __defaults = [ x for x in dir(_config_defaults) if not x.startswith('_') ]
 __parser = __get_argparser()
 __flags,__args = __parser.parse_known_args(__sys.argv)
 __user_config = [ ] if __flags.noconfig else [ __flags.configfile ]
-__site_config = [ ] if __flags.nositeconfig else [ 'casaconfigsite' ]
+__site_config = [ ] if __flags.nositeconfig else [ 'casasiteconfig' ]
 
 ## files to be evaluated/loaded
 __config_files = [ * __site_config , *__user_config ]

{casaconfig-0.0.73 → casaconfig-0.0.75}/casaconfig/private/data_update.py

@@ -30,6 +30,11 @@ def data_update(path=None, version=None, force=False, logger=None, auto_update_r
     If the version is None (the default) then the most recent version returned by 
     data_available is used.
 
+    If version is "release" then the version associated with the release in 
+    the dictionary returned by get_data_info is used. If there is no release
+    version information known then an error message is printed and nothing is
+    updated.
+
     If the version requested matches the one in the readme.txt file at path then this function does
     nothing unless force is True.
 
@@ -94,6 +99,8 @@ def data_update(path=None, version=None, force=False, logger=None, auto_update_r
     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 .get_data_info import get_data_info
+    from .read_readme import read_readme
 
     if path is None:
         from .. import config as _config
@@ -134,15 +141,12 @@ def data_update(path=None, version=None, force=False, logger=None, auto_update_r
     installed_files = []
     currentVersion = []
     currentDate = []
-    try:
-        with open(readme_path, 'r') as fid:
-            readme = fid.readlines()
-            currentVersion = readme[1].split(':')[1].strip()
-            currentDate = readme[2].split(':')[1].strip()
-            for readme_line in readme[3:]:
-                if (readme_line[0] != '#'):
-                    installed_files.append(readme_line.strip())
-    except:
+    dataReadmeInfo = read_readme(readme_path)
+    if dataReadmeInfo is not None:
+        currentVersion = dataReadmeInfo['version']
+        currentDate = dataReadmeInfo['date']
+        installed_files = dataReadmeInfo['extra']
+    else:
         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)
         # no lock has been set yet, safe to simply return here
@@ -164,9 +168,20 @@ def data_update(path=None, version=None, force=False, logger=None, auto_update_r
 
     available_data = data_available()
     requestedVersion = version
+
     if requestedVersion is None:
         requestedVersion = available_data[-1]
-        
+
+    expectedMeasuresVersion = None
+    if requestedVersion is 'release':
+        # 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)
+            return
+        requestedVersion = releaseInfo['casarundata']
+        expectedMeasuresVersion = releaseInfo['measures']
+
     if requestedVersion not in available_data:
         print_log_messages('Requested casarundata version %s was not found. See available_data for a list of available casarundata versions.' % requestedVersion)
         # no lock has been set yet, safe to simply return here
@@ -174,9 +189,28 @@ def data_update(path=None, version=None, force=False, logger=None, auto_update_r
 
     # don't update if force is false and the requested version is already installed
     if force is False and (currentVersion == requestedVersion):
-        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
+        if expectedMeasuresVersion is not None:
+            # the 'release' version has been requested, need to check the measures version
+            # assume a force is necessary until the measures version is known to be OK
+            force = True
+            measures_readme_path = os.path.join(path,'geodetic/readme.txt')
+            if os.path.exists(measures_readme_path):
+                measuresReadmeInfo = read_readme(measures_readme_path)
+                if measuresReadmeInfo is not None:
+                    measuresVersion = measuresReadmeInfo['version']
+                    if measuresVersion == expectedMeasuresVersion:
+                        # it's OK, do not force
+                        force = False
+                # if measuresReadmeInfo is None then that's a problem and force remains True
+            if not force:
+                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
+            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
 
     # an update appears necessary
 
@@ -195,35 +229,47 @@ def data_update(path=None, version=None, force=False, logger=None, auto_update_r
 
         do_update = True
         # it's possible that another process had path locked and updated the readme with new information, re-read it
-        try :
-            readme = None
-            with open(readme_path, 'r') as fid:
-                readme = fid.readlines()
-                currentVersion = readme[1].split(':')[-1].strip()
-                currentDate = readme[2].split(':')[-1].strip()
+        dataReadmeInfo = read_readme(readme_path)
+        if dataReadmeInfo is not None:
+            currentVersion = dataReadmeInfo['version']
+            currentDate = dataReadmeInfo['date']
+            installedFiles = dataReadmeInfo['extra']
             if ((currentVersion == requestedVersion) and (not force)):
-                # nothing to do here, already at the expected version and an update is not being forced
-                do_update = False
-                print_log_messages('data_update requested version is already installed.', logger)
-            else:
-                installed_files = []
-                for readme_line in readme[3:]:
-                    installed_files.append(readme_line.strip())
+                if expectedMeasuresVersion is not None:
+                    # this is a 'release' update request, need to check that the measures version is also now OK
+                    measures_readme_path = os.path.update(path,'geodetic/readme.txt')
+                    if os.path.exists(measures_readme_path):
+                        measuresReadmeInfo = read_readme(measures_readme_path)
+                        if measuresReadmeInfo is not None:
+                            measuresVersion = measuresReadmeInfo['version']
+                            if measuresVersion == expectedMeasuresVersion:
+                                do_update = False
+                        # if measuresReadmeInfo is None there was a problem which requires a full update so do_update remains True
+                    if not do_update:
+                        print_log_messages('data update requested "release" version of casarundata and measures are already installed.', logger)
+                else:
+                    # nothing to do here, already at the expected version and an update is not being forced
+                    do_update = False
+                    print_log_messages('data_update requested version is already installed.', logger)
+                    
+            if do_update:
+                # update is still on, check the manifest
                 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', logger, True)
-        except:
+                    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)
+        else:
             # this shouldn't happen, do not do an update
             do_update = False
-            print_log_messages('Unexpected error reading readme.txt file during data_update, can not safely update to the requested version', logger, True)
+            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)
 
     
         if do_update:
-            do_pull_data(path, requestedVersion, installed_files, logger)
+            do_pull_data(path, requestedVersion, installed_files, currentVersion, currentDate, logger)
 
         # truncate the lock file
         lock_fd.truncate(0)
@@ -232,8 +278,8 @@ def data_update(path=None, version=None, force=False, logger=None, auto_update_r
         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)
         # leave the contents of the lock file as is to aid in debugging
-        import traceback
-        traceback.print_exc()
+        # import traceback
+        # traceback.print_exc()
 
     # if the lock file is not closed, do that now to release the lock
     if lock_fd is not None and not lock_fd.closed:

{casaconfig-0.0.73 → casaconfig-0.0.75}/casaconfig/private/do_pull_data.py

@@ -1,4 +1,4 @@
-# Copyright 2020 AUI, Inc. Washington DC, USA
+# Copyright 2023 AUI, Inc. Washington DC, USA
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-def do_pull_data(path, version, installed_files, logger):
+def do_pull_data(path, version, installed_files, currentVersion, currentDate, logger):
     """
     Pull the casarundata for the given version and install it in path, removing
     the isntalled files and updating the readme.txt file when done.
@@ -27,6 +27,8 @@ def do_pull_data(path, version, installed_files, logger):
        - path (str) - Folder path to place casadata contents.
        - version (str) - casadata version to retrieve.
        - installed_files (str list) - list of installed files from the version already installed. Set to an empty list if there is no previously installed version.
+       - currentVersion (str) - from the readme file if it already exists, or an empty string if there is no previously installed version.
+       - currentDate (str) - from the readme file if it already exists, or an empty string if there is no previously installed version.
        - logger (casatools.logsink) - Instance of the casalogger to use for writing messages. Messages are always written to the terminal. Set to None to skip writing messages to a logger.
 
     Returns

{casaconfig-0.0.73 → casaconfig-0.0.75}/casaconfig/private/get_data_info.py

@@ -25,16 +25,16 @@ def get_data_info(path=None, logger=None):
     The path is the location to use to search for the installed release information.
     The path argument defaults to config.measurespath when not set.
 
-    For each type the value is a dictionary of 'version' and 'date' where
-    version is the version string and date is the date when it was installed.
-    These values are taken from the readme.txt file for each type.
+    The casarundata and measures type value are each a dictionary of 'version' 
+    and 'date' where version is the version string and date is the date when it  
+    was installed These values are taken from the readme.txt file for each type.
 
     The 'release' type is from the release_data_readme.txt file which is copied
-    into place when a modular CASA is built. It is the release.txt for the
-    data appropriate for that module CASA release and it used by the "--reference-testing"
-    command line option for casaconfig. That allows casaconfig to install that
+    into place when a modular CASA is built. It consists of a dictionary of
+    'casarundata' and 'measures' where the values are the version strings for each
+    type of data for this release. That allows casaconfig to install that
     casarundata version for testing purposes. The release information does not depend 
-    on the path argument.
+    on the path argument since it is found in the casaconfig module.
 
     If path is empty or does not exist then the return value for the 'casarundata' and
     'measures' types is None.
@@ -51,7 +51,7 @@ def get_data_info(path=None, logger=None):
     a legacy installation of CASA data. CASA may be able to use any measures tables at this
     location by they can not be maintained by casaconfig.
 
-    If no casadata release information is found the returned
+    If no casadata release information is found or the contents are unexpected the returned
     value for 'release' is None and the "--reference-testing" option will not do anything
     for this installation of casaconfig. This will be the case for a modular installation.
 
@@ -72,6 +72,7 @@ def get_data_info(path=None, logger=None):
     import os
     import importlib.resources
     from .print_log_messages import print_log_messages
+    from .read_readme import read_readme
 
     if path is None:
         from .. import config as _config
@@ -94,16 +95,14 @@ def get_data_info(path=None, logger=None):
         datareadme_path = os.path.join(path,'readme.txt')
         if os.path.exists(datareadme_path):
             # the readme exists, get the info
-            try:
-                with open(datareadme_path, 'r') as fid:
-                    readme = fid.readlines()
-                    currentVersion = readme[1].split(':')[1].strip()
-                    currentDate = readme[2].split(':')[1].strip()
-                    # this one is just a check that there's the manifest is probably also OK
-                    line4 = readme[4]
+            result['casarundata'] = {'version':'error', 'date':''}
+            readmeContents = read_readme(datareadme_path)
+            if readmeContents is not None:
+                currentVersion = readmeContents['version']
+                currentDate = readmeContents['date']
+                # this one is just a check that the manifest at least exists
+                if len(readmeContents['extra']) > 0:
                     result['casarundata'] = {'version':currentVersion, 'date':currentDate}
-            except:
-                result['casarundata'] = {'version':'error', 'date':''}
         else:
             # does it look like it's probably casarundata?
             expected_dirs = ['alma','catalogs','demo','ephemerides','geodetic','gui','nrao']
@@ -121,14 +120,12 @@ def get_data_info(path=None, logger=None):
         measuresreadme_path = os.path.join(path,'geodetic/readme.txt')
         if os.path.exists(measuresreadme_path):
             # the readme exists, get the info
-            try:
-                with open(measuresreadme_path, 'r') as fid:
-                    readme = fid.readlines()
-                    currentVersion = readme[1].split(':')[1].strip()
-                    currentDate = readme[2].split(':')[1].strip()
-                    result['measures'] = {'version':currentVersion, 'date':currentDate}
-            except:
-                result['measures'] = {'version':'error', 'date':''}
+            result['measures'] = {'version':'error', 'date':''}
+            readmeContents = read_readme(measuresreadme_path)
+            if readmeContents is not None:
+                currentVersion = readmeContents['version']
+                currentDate = readmeContents['date']
+                result['measures'] = {'version':currentVersion,'date':currentDate}
         else:
             # does it look like it's probably measuresdata?
             # path should have ephemerides and geodetic directories
@@ -141,12 +138,49 @@ def get_data_info(path=None, logger=None):
     # release data versions
     if importlib.resources.is_resource('casaconfig','release_data_readme.txt'):
         try:
+            casarundataVersion = None
+            measuresVersion = None
+            ok = True
+            reason = None
             readme_lines = importlib.resources.read_text('casaconfig','release_data_readme.txt').split('\n')
-            currentVersion = readme_lines[1].split(':')[1].strip()
-            currentDate = readme_lines[2].split(':')[1].strip()
-            result['release'] = {'version':currentVersion, 'date':currentDate}
+            for readmeLine in readme_lines:
+                # lines must contain something and not start with #
+                if len(readmeLine) > 0 and readmeLine[0] != '#':
+                    splitLine = readmeLine.split(':')
+                    if len(splitLine) == 2:
+                        lineType = splitLine[0].strip()
+                        lineVers = splitLine[1].strip()
+                        if lineType == 'casarundata':
+                            if casarundataVersion is not None:
+                                ok = False
+                                reason = "duplicate casarundata lines"
+                                break
+                            casarundataVersion = lineVers
+                        elif lineType == 'measures':
+                            if measuresVersion is not None:
+                                ok = False
+                                reason = "duplicate measures lins"
+                                break
+                            measuresVersion = lineVers
+                        else:
+                            ok = False
+                            reason = "Unexpected type : %s" % lineType
+                            break
+                    else:
+                        ok = False
+                        reason = "Missing or too many ':' separators"
+            if (casarundataVersion is None or measuresVersion is None) and ok:
+                ok = False
+                reason = "missing one or more version strings for expected casarundata and measures types"
+
+            if not ok:
+                print_log_messages("Incorrectly formatted release_data_readme.txt. %s" % reason, logger, True)
+                # leave 'release' as None
+            else:
+                result['release'] = {'casarundata':casarundataVersion, 'measures':measuresVersion}
         except:
-            result['release'] = {'version':'error', 'date':''}
+            print("Unexpected error reading release_data_readme.txt")
+            # leave 'release' as None
     else:
         # no release information available, probably a modular install only
         # leave 'release' as None

{casaconfig-0.0.73 → casaconfig-0.0.75}/casaconfig/private/measures_update.py

@@ -106,6 +106,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 .read_readme import read_readme
     
     if path is None:
         from .. import config as _config
@@ -142,13 +143,10 @@ def measures_update(path=None, version=None, force=False, logger=None, auto_upda
     # if measures are already preset, get their version
     readme_path = os.path.join(path,'geodetic/readme.txt')
     if os.path.exists(readme_path):
-        try:
-            with open(readme_path, 'r') as fid:
-                readme = fid.readlines()
-            current = readme[1].split(':')[-1].strip()
-            updated = readme[2].split(':')[-1].strip()
-        except:
-            pass
+        readmeInfo = read_readme(readme_path)
+        if readmeInfo is not None:
+            current = readmeInfo['version']
+            updated = readmeInfo['date']
 
     # don't re-download the same data
     if not force:
@@ -184,13 +182,10 @@ def measures_update(path=None, version=None, force=False, logger=None, auto_upda
             current = None
             updated = None
             if os.path.exists(readme_path):
-                try:
-                    with open(readme_path, 'r') as fid:
-                        readme = fid.readlines()
-                        current = readme[1].split(':')[-1].strip()
-                        updated = readme[2].split(':')[-1].strip()
-                except:
-                    pass
+                readmeInfo = read_readme(readme_path)
+                if readmeInfo is not None:
+                    current = readmeInfo['version']
+                    updated = readmeInfo['date']
 
             if ((version is not None) and (version == current)) or ((version is None) and (updated == today_string)):
                 # no update will be done, version is as requested or it's already been updated today

{casaconfig-0.0.73 → casaconfig-0.0.75}/casaconfig/private/pull_data.py

@@ -26,6 +26,11 @@ def pull_data(path=None, version=None, force=False, logger=None):
 
     If version is None (the default) then the most recent version is pulled.
 
+    If version is "release" then the version associated with the release in 
+    the dictionary returned by get_data_info is used. If there is no release
+    version information known then an error message is printed and nothing is
+    updated.
+
     A text file (readme.txt at path) records the version string, the date
     when that version was installed in path, and the files installed into path.
     This file is used to determine if the contents are a previously installed 
@@ -78,6 +83,8 @@ def pull_data(path=None, version=None, force=False, logger=None):
     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 .get_data_info import get_data_info
+    from .read_readme import read_readme
 
     if path is None:
         from .. import config as _config
@@ -101,15 +108,12 @@ def pull_data(path=None, version=None, force=False, logger=None):
     if not do_pull:
         # if the readme_path exists, find the current version, install date, and installed files
         if os.path.exists(readme_path):
-            try:
-                with open(readme_path,'r') as fid:
-                    readme = fid.readlines()
-                    currentVersion = readme[1].split(':')[1].strip()
-                    currentDate = readme[2].split(':')[1].strip()
-                    for readme_line in readme[3:]:
-                        if (readme_line[0] != "#"):
-                            installed_files.append(readme_line.strip())
-            except:
+            readmeInfo = read_readme(readme_path)
+            if readmeInfo is not None:
+                currentVersion = readmeInfo['version']
+                currentDate = readmeInfo['date']
+                installed_files = readmeInfo['extra']
+            else:
                 print_log_messages('destination path is not empty and 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)
                 # no lock has been set yet, safe to simply return here
@@ -149,6 +153,16 @@ def pull_data(path=None, version=None, force=False, logger=None):
         # need a version, use most recent available
         version = available_data[-1]
 
+    expectedMeasuresVersion = None
+    if version is 'release':
+        # 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)
+            return
+        version = releaseInfo['casarundata']
+        expectedMeasuresVersion = releaseInfo['measures']
+
     if version not in available_data:
         print_log_messages('version %s not found on CASA server, use casaconfig.data_available for a list of casarundata versions' % version, logger, True)
         return
@@ -175,35 +189,47 @@ def pull_data(path=None, version=None, force=False, logger=None):
         if not force and os.path.exists(readme_path):
             # the readme file needs to be reread here
             # it's possible that another process had path locked and updated the readme file with new information
-            try :
-                readme = None
-                with open(readme_path, 'r') as fid:
-                    readme = fid.readlines()
-                    currentVersion = readme[1].split(':')[-1].strip()
-                    currentDate = readme[2].split(':')[-1].strip()
+            readmeInfo = read_readme(readme_path)
+            if readmeInfo is not None:
+                currentVersion = readmeInfo['version']
+                currentDate = readmeInfo['date']
                 if ((currentVersion == version) and (not force)):
-                    # nothing to do here, already at the expected version a pull is not being forced
-                    do_pull = False
-                    print_log_messages('pull_data requested version is already installed.', logger)
-                else:
+                    if expectedMeasuresVersion is not None:
+                        # this is a release pull and the measures version must also match
+                        # start off assuming a pull is necessary
+                        do_pull = True
+                        measures_readme_path = os.path.join(path,'geodetic/readme.txt')
+                        if os.path.exists(measures_readme_path):
+                            measuresReadmeInfo = read_readme(measures_readme_path)
+                            if measuresReadmeInfo is not None:
+                                measuresVersion = measuresReadmeInfo['version']
+                                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)
+                            # otherwise the measures readme info is suspect and the pull should happen
+                    else:
+                        # nothing to do here, already at the expected version and a pull is not being forced
+                        do_pull = False
+                        print_log_messages('pull_data requested version is already installed.', logger)
+
+                if do_pull:
                     # make sure the copy of installed_files is the correct one
-                    installed_files = []
-                    for readme_line in readme[3:]:
-                        installed_files.append(readme_line.strip())
+                    installed_files = readmeInfo['extra']
                     if len(installed_files) == 0:
                         # this shoudn't happen, do not do a pull
                         do_pull = False
                         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)                    
-            except:
+            else:
                 # this shouldn't happen, do not do a pull
                 do_pull = False
                 print_log_messages('Unexpected error reading 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)
                 
         if do_pull:
-            do_pull_data(path, version, installed_files, logger)
+            do_pull_data(path, version, installed_files, currentVersion, currentDate, logger)
                         
         # truncate the lock file
         lock_fd.truncate(0)
@@ -212,8 +238,8 @@ def pull_data(path=None, version=None, force=False, logger=None):
         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)
         # leave the contents of the lock file as is to aid in debugging
-        import traceback
-        traceback.print_exc()
+        # import traceback
+        # traceback.print_exc()
 
     # if the lock file is not closed, do that now to release the lock
     if lock_fd is not None and not lock_fd.closed:

casaconfig-0.0.75/casaconfig/private/read_readme.py

@@ -0,0 +1,60 @@
+# Copyright 2023 AUI, Inc. Washington DC, USA
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+def read_readme(path):
+    """
+    Read and parse the contents of a readme.txt file used by casaconfig.
+
+    A dictionary containing the 'version', 'date', and 'extra' (containing
+    a list of optional extra lines found). On error, the return values is None.
+
+    The extra lines are stripped and do not include lines begining with '#'
+
+    The format is assumed to be:
+        a line begining with #, which is ignored.
+        a line "version : the versions string"
+        a line "date : the date"
+        optional extra lines (the manifest of installed files for the main readme)
+
+    The version string and date are stripped of leading and trailing whitespace.
+
+    Parameters
+       - path (str) - the path to the file to be read
+
+    Returns
+       Dictionary of 'version' (the version string), 'date' (the date string),
+       'extra' (a list of any extra lines found). The return value is None on error.
+    """
+
+    import os
+
+    version = ""
+    date = ""
+    extra = []
+    result = None
+    
+    try:
+        with open(path, 'r') as fid:
+            readmeLines = fid.readlines()
+            version = readmeLines[1].split(':')[1].strip()
+            date = readmeLines[2].split(':')[1].strip()
+            if len(readmeLines) > 3:
+                for extraLine in readmeLines[3:]:
+                    if (extraLine[0] != '#'):
+                        extra.append(extraLine.strip())
+            result = {'version':version, 'date':date, 'extra':extra}
+    except:
+        pass
+
+    return result

{casaconfig-0.0.73 → casaconfig-0.0.75/casaconfig.egg-info}/PKG-INFO

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

{casaconfig-0.0.73 → casaconfig-0.0.75}/casaconfig.egg-info/SOURCES.txt

@@ -26,5 +26,6 @@ casaconfig/private/measures_available.py
 casaconfig/private/measures_update.py
 casaconfig/private/print_log_messages.py
 casaconfig/private/pull_data.py
+casaconfig/private/read_readme.py
 casaconfig/private/set_casacore_path.py
 casaconfig/private/update_all.py

{casaconfig-0.0.73 → casaconfig-0.0.75}/setup.py

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