casaconfig 1.0.3__py3-none-any.whl → 1.1.1__py3-none-any.whl

casaconfig/__main__.py

@@ -131,10 +131,6 @@ except casaconfig.RemoteError as exc:
     print("This is likely due to no network connection or bad connectivity to a remote site, wait and try again")
     sys.exit(1)
 
-except casaconfig.NoNetwork as exc:
-    print("No network seen, can not continue.")
-    sys.exit(1)
-
 except casaconfig.BadLock as exc:
     # the output produced by the update functions is sufficient, just re-echo the exception text itself
     print(str(exc))

casaconfig/private/CasaconfigErrors.py

@@ -36,12 +36,7 @@ class RemoteError(Exception):
 
 class NotWritable(Exception):
     """Raised when the path is not writable by the user"""
-    pass
 
 class UnsetMeasurespath(Exception):
     """Raised when a path argument is None"""
     pass
-
-class NoNetwork(Exception):
-    """Raised when there is no network connection."""
-    pass

casaconfig/private/data_available.py

@@ -36,8 +36,7 @@ def data_available():
        list - version names returned as list of strings
 
     Raises
-       - casaconfig.NoNetwork - Raised where there is no network seen, can not continue
-       - casaconfig.RemoteError - Raised when there is an error fetching some remote content for some reason other than no network
+       - casaconfig.RemoteError - Raised when there is an error fetching some remote content
        - Exception - Unexpected exception while getting list of available casarundata versions
 
     """
@@ -49,12 +48,6 @@ def data_available():
     import certifi
 
     from casaconfig import RemoteError
-    from casaconfig import NoNetwork
-
-    from .have_network import have_network
-
-    if not have_network():
-        raise NoNetwork("No network, can not find the list of available data.")
     
     class LinkParser(html.parser.HTMLParser):
         def reset(self):

casaconfig/private/data_update.py

@@ -17,7 +17,7 @@ this module will be included in the api
 
 def data_update(path=None, version=None, force=False, logger=None, auto_update_rules=False, verbose=None):
     """
-    Check for updates to the installed casarundata and install the update or change to
+    Check for updates to the installed casarundata and install the update or change to 
     the requested version when appropriate.
 
     The verbose argument controls the level of information provided when this function when the data
@@ -26,19 +26,19 @@ def data_update(path=None, version=None, force=False, logger=None, auto_update_r
 
     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).
-
+    
     If path is None then config.measurespath is used.
 
-    If the version is None (the default) then the most recent version returned by
+    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
+    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 available to casaconfig then an error message is printed
+    version information available to casaconfig then an error message is printed 
     and nothing is updated. Release version information is only available in
     monolithic CASA installations.
 
-    If a specific version is not requested (the default) and a check for the
+    If a specific version is not requested (the default) and a check for the 
     versions available for installation at path has been done within the past
     24 hours then this function does nothing even if there is a more
     recent version available from the CASA server unless force is True.
@@ -47,7 +47,7 @@ def data_update(path=None, version=None, force=False, logger=None, auto_update_r
     now) is installed even if that version is already installed or a check for the
     latest version has been done within the past 24 hours.
 
-    A text file (readme.txt at path) records the version string, the date
+    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. That file
     must already exist in path in order to use this function. Use pull_data to install
     casarundata into a new location.
@@ -57,31 +57,31 @@ def data_update(path=None, version=None, force=False, logger=None, auto_update_r
     data_auto_update is True. Automatic updating happens during casatools initialization
     so that the updated casarundata and measures are in place before any tool needs to use them.
 
-    If an update is to be installed the previously installed files, as listed in the
-    readme.txt file at path, are removed before the contents of the version
+    If an update is to be installed the previously installed files, as listed in the 
+    readme.txt file at path, are removed before the contents of the version 
     being installed are unpacked. If the measures contents of path have been updated since
     the previously installed version of casarundata then those updates will also be removed
     by this data update while preparing to install the requested version of casarundata (which
-    includes a copy of the measures data that is likely older than today). A data update is
-    typically followed by a measures_update to ensure that the most recent measures data
+    includes a copy of the measures data that is likely older than today). A data update is 
+    typically followed by a measures_update to ensure that the most recent measures data 
     are installed.
 
     A file lock is used to prevent more that one data update (pull_data, measures_update,
-    or data_update) from updating any files in path at the same time. When locked, the
+    or data_update) from updating any files in path at the same time. When locked, the 
     lock file (data_update.lock in path) contains information about the process that
     has the lock. When data_update gets the lock it checks the readme.txt file in path
-    to make sure that an update is still necessary (if force is True then an update
+    to make sure that an update is still necessary (if force is True then an update 
     always happens). If the lock file is not empty then a previous update of path (pull_data,
     data_update, or measures_update) did not exit as expected or is still in process (via a
-    separate instance of CASA) and the contents of path may be suspect. In that case,
-    an error will be reported and nothing will be updated. The lock file can be checked to
-    see the details of when that file was locked. The lock file can be removed and data_update
+    separate instance of CASA) and the contents of path may be suspect. In that case, 
+    an error will be reported and nothing will be updated. The lock file can be checked to 
+    see the details of when that file was locked. The lock file can be removed and data_update 
     can be tried again. It may be safest in that case to remove path completely or use a
     different path and use pull_data to install a fresh copy of the desired version.
 
-    Some of the tables installed by data_update are only read when casatools starts. Use of
-    data_update except during CASA startup by the auto update proess  should typically be
-    followed by a restart of CASA so that any changes are seen by the tools and tasks that
+    Some of the tables installed by data_update are only read when casatools starts. Use of 
+    data_update except during CASA startup by the auto update proess  should typically be 
+    followed by a restart of CASA so that any changes are seen by the tools and tasks that 
     use this data.
 
     **Note:** data_update requires that the expected readme.txt file already exists at the top-level
@@ -101,10 +101,10 @@ def data_update(path=None, version=None, force=False, logger=None, auto_update_r
        - 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) - Level of output, 0 is none, 1 is to logger, 2 is to logger and terminal, defaults to casaconfig_verbose in the config dictionary.
-
+        
     Returns
        None
-
+    
     Raises
        - casaconfig.AutoUpdatesNotAllowed - raised when path does not exist as a directory or is not owned by the user
        - casaconfig.BadLock - raised when the lock file was not empty when an attempt was made to obtain the lock
@@ -167,7 +167,7 @@ def data_update(path=None, version=None, force=False, logger=None, auto_update_r
     # path must be writable with execute bit set
     if (not os.access(path, os.W_OK | os.X_OK)) :
         raise NotWritable('data_update: No permission to write to %s, cannot update.' % path)
-
+    
     # try and digest the readme file
 
     installed_files = []
@@ -177,7 +177,7 @@ def data_update(path=None, version=None, force=False, logger=None, auto_update_r
 
     # already checked that path is OK, type is OK here, no need to trap for exceptions here
     dataReadmeInfo = get_data_info(path, logger, type='casarundata')
-
+    
     if dataReadmeInfo is None or dataReadmeInfo['version'] == 'invalid':
         msgs = []
         msgs.append('The readme.txt file at path could not be read as expected')
@@ -262,7 +262,7 @@ def data_update(path=None, version=None, force=False, logger=None, auto_update_r
             else:
                 if verbose > 0:
                     print_log_messages('Requested casarundata version is already installed in %s, %s' % (path, currentVersion), logger, verbose=verbose)
-
+                
             # no lock has been set yet, safe to simply return here
             return
 
@@ -307,7 +307,7 @@ def data_update(path=None, version=None, force=False, logger=None, auto_update_r
                         # always verbose here because the lock file is in use
                         print_log_messages('requested version is already installed.', logger)
                     do_update = False
-
+                    
             if do_update:
                 # update is still on, check the manifest
                 if len(installed_files) == 0:
@@ -360,5 +360,5 @@ def data_update(path=None, version=None, force=False, logger=None, auto_update_r
             if clean_lock:
                 lock_fd.truncate(0)
             lock_fd.close()
-
+    
     return

casaconfig/private/get_data_lock.py

@@ -29,9 +29,6 @@ def get_data_lock(path, fn_name):
 
     This function is intended for internal casaconfig use.
 
-    If there is not network (have_network returns False) then the lock file is not
-    set or initialized and a NoNetwork exception is raised.
-
     Parameters
        - path (str) - The location where 'data_update.log' is to be found.
        - fn_name (str) - A string giving the name of the calling function to be recorded in the lock file.
@@ -40,7 +37,6 @@ def get_data_lock(path, fn_name):
        - the open file descriptor holding the lock. Close this file descriptor to release the lock.
 
     Raises:
-        - casaconfig.NoNetwork - raised wheren there is no network, nothing can be downloaded so nothing should be locked.
         - casaconfig.BadLock - raised when the path to the lock file does not exist or the lock file is not empty as found
         - Exception - an unexpected exception was seen while writing the lock information to the file
 
@@ -52,11 +48,6 @@ def get_data_lock(path, fn_name):
     from datetime import datetime
 
     from casaconfig import BadLock
-    from casaconfig import NoNetwork
-    from .have_network import have_network
-
-    if not have_network():
-        raise NoNetwork("No network, lock file has not been set, unable to continue.")
 
     if not os.path.exists(path):
         raise BadLock("path to contain lock file does not exist : %s" % path)

casaconfig/private/measures_available.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.
@@ -15,12 +15,11 @@
 this module will be included in the api
 """
 
-
 def measures_available():
     """
-    List available measures versions on the ASTRON server
+    List available measures versions on ASTRON at https://www.astron.nl/iers/
 
-    This returns a list of the measures files available on the ASTRON
+    This returns a list of the measures versions available on the ASTRON
     server. The version parameter of measures_update must be one
     of the values in that list if set (otherwise the most recent version
     in this list is used).
@@ -29,38 +28,57 @@ def measures_available():
        None
     
     Returns
-       version names returned as list of strings
+       list - version names returned as list of strings
 
-    Raises:
-       - casaconfig.NoNetwork - raised when there is no network (have_data returns False)
-       - casaconfig.RemoteError - raised when when a socket.gaierror is seen, unlikely due to the have_network check
-       - Exception: raised when any unexpected exception happens
+    Raises
+       - casaconfig.RemoteError - Raised when there is an error fetching some remote content
+       - Exception - Unexpected exception while getting list of available measures versions
 
     """
-    from ftplib import FTP
-    import socket
+
+    import html.parser
+    import urllib.request
+    import urllib.error
+    import ssl
+    import certifi
 
     from casaconfig import RemoteError
-    from casaconfig import NoNetwork
 
-    from .have_network import have_network
+    class LinkParser(html.parser.HTMLParser):
+        def reset(self):
+            super().reset()
+            self.rundataList = []
+
+        def handle_starttag(self, tag, attrs):
+            if tag == 'a':
+                for (name, value) in attrs:
+                    # only care if this is an href and the value starts with
+                    # WSRT_Measures and has 'tar' after character 15 to exclude the "WSRT_Measures.ztar" file
+                    # without relying on the specific type of compression or nameing in  more detail than that
+                    if name == 'href' and (value.startswith('WSRT_Measures') and (value.rfind('tar')>15)):
+                        # only add it to the list if it's not already there
+                        if (value not in self.rundataList):
+                            self.rundataList.append(value)
 
-    if not have_network():
-        raise NoNetwork("can not find the list of available measures data")
-    
-    files = []
     try:
-        ftp = FTP('ftp.astron.nl')
-        rc = ftp.login()
-        rc = ftp.cwd('outgoing/Measures')
-        files = ftp.nlst()
-        ftp.quit()
-        #files = [ff.replace('WSRT_Measures','').replace('.ztar','').replace('_','') for ff in files]
-        files = [ff for ff in files if (len(ff) > 0) and (not ff.endswith('.dat'))]
-    except socket.gaierror as gaierr:
-        raise RemoteError("Unable to retrieve list of available measures versions : " + str(gaierr)) from None
+        context = ssl.create_default_context(cafile=certifi.where())
+        with urllib.request.urlopen('https://www.astron.nl/iers', context=context, timeout=400) as urlstream:
+            parser = LinkParser()
+            encoding = urlstream.headers.get_content_charset() or 'UTF-8'
+            for line in urlstream:
+                parser.feed(line.decode(encoding))
+
+        # return the sorted list, earliest versions are first, newest is last
+        return sorted(parser.rundataList)
+
+    except urllib.error.URLError as urlerr:
+        raise RemoteError("Unable to retrieve list of available measures versions : " + str(urlerr)) from None
+        
     except Exception as exc:
         msg = "Unexpected exception while getting list of available measures versions : " + str(exc)
         raise Exception(msg)
-        
-    return files
+
+    # nothing to return if it got here, must have been an exception
+    return []
+
+    

casaconfig/private/measures_update.py

@@ -17,20 +17,23 @@ 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):
     """
-    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 ASTRON into 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.
 
-    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).
 
     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
-    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.
@@ -43,9 +46,9 @@ def measures_update(path=None, version=None, force=False, logger=None, auto_upda
     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
+    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 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.
@@ -75,11 +78,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 +94,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,25 +107,25 @@ 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.
        - 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.
+       - 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 casaconfig_verbose in config dictionary.
         
     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.RemoteError - raised by measures_available when the remote list of measures could not be fetched
+       - 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
@@ -130,16 +133,15 @@ def measures_update(path=None, version=None, force=False, logger=None, auto_upda
     from datetime import datetime
     import sys
 
-    from ftplib import FTP
     import tarfile
     import re
     import ssl
     import urllib.request
     import certifi
-    import fcntl
+    import shutil
 
     from casaconfig import measures_available
-    from casaconfig import AutoUpdatesNotAllowed, UnsetMeasurespath, RemoteError, NotWritable, BadReadme, BadLock, NoReadme, NoNetwork
+    from casaconfig import AutoUpdatesNotAllowed, UnsetMeasurespath, RemoteError, NotWritable, BadReadme, BadLock, NoReadme
 
     from .print_log_messages import print_log_messages
     from .get_data_lock import get_data_lock
@@ -209,11 +211,8 @@ def measures_update(path=None, version=None, force=False, logger=None, auto_upda
             # get the current most recent version
             try:
                 checkVersion = measures_available()[-1]
-            except NoNetwork as exc:
-                # no network, no point in continuing, just reraise
-                raise exc
             except RemoteError as exc:
-                # bad network?, no point in continuing, just reraise
+                # no network, no point in continuing, just reraise
                 raise exc                
             except:
                 # unsure what happened, leave it at none, which will trigger an update attempt, which might work
@@ -248,7 +247,7 @@ 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)
 
@@ -290,13 +289,9 @@ def measures_update(path=None, version=None, force=False, logger=None, auto_upda
             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)
+            print_log_messages('  ... finding available measures at www.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)])
+            files = measures_available()
 
             # 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
@@ -306,51 +301,51 @@ def measures_update(path=None, version=None, force=False, logger=None, auto_upda
                 print_log_messages("measures_update can't find specified version %s" % target, logger, True)
 
             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()
-
+                # there are files to extract
+                print_log_messages('  ... downloading %s from ASTRON server to %s ...' % (target, path), logger)
+
+                astronURL = 'https://www.astron.nl/iers'
+                context = ssl.create_default_context(cafile=certifi.where())
+                # just in case there's a redirect at astron the way there is for the go.nrao.edu site and casarundata
+                measuresURLroot = urllib.request.urlopen(astronURL, context=context).url
+                measuresURL = os.path.join(measuresURLroot, target)
+                
+                # it's at this point that this code starts modifying what's there so the lock file should
+                # not be removed on failure after this although it may leave that temp tar file around, but that's OK
+                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)
-
+                # custom filter that incorporates data_filter to watch for dangerous members of the tar file and
+                # add 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
+
+                with urllib.request.urlopen(measuresURL, context=context, timeout=400) as tstream, tarfile.open(fileobj=tstream, mode='r|*') as tar :
                     # 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)
+                    tar.extraction_filter = custom_filter
+                    tar.extractall(path=path)
+                    tar.close()
 
                 # 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')))
 
+                clean_lock = True
                 print_log_messages('  ... measures data updated at %s' % path, logger)
 
-                clean_lock = True
-            
             # closing out the do_update
 
         # closing out the try block

casaconfig/private/pull_data.py

@@ -22,15 +22,15 @@ 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.
-
-    The path must either contain a previously installed version of casarundata
+  
+    The path must either contain a previously installed version of casarundata 
     or it must not exist or be empty.
 
     If path is None then config.measurespath will be used.
 
     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
+    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
     checked or installed.
@@ -43,20 +43,20 @@ def pull_data(path=None, version=None, force=False, logger=None, verbose=None):
 
     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
+    This file is used to determine if the contents are a previously installed 
     version. If path is not empty then this file must exist with the expected
     contents in order for pull_data to proceed.
 
-    If the version to be pulled matches the version in the readme.txt file then
+    If the version to be pulled matches the version in the readme.txt file then 
     pull_data does nothing unless force is True. No error messages will result when the
     version already matches what was previously installed (no installation is then
     necessary unless force is True).
 
-    The measures tables included in casarundata will typically not be the most
+    The measures tables included in casarundata will typically not be the most 
     recent version. To get the most recent measures data, measures_update
     should be used after pull_data.
 
-    If path contains a previously installed version then all of the files listed in
+    If path contains a previously installed version then all of the files listed in 
     the manifest part of the readme.txt file are first removed from path. This ensures
     that files not present in the version being installed are removed in moving to the
     other version.
@@ -65,23 +65,23 @@ def pull_data(path=None, version=None, force=False, logger=None, verbose=None):
     or data_update) from updating any files in path at the same time. When locked, the
     lock file (data_update.lock in path) contains information about the process that
     has the lock. When pull_data gets the lock it checks the readme.txt file in path
-    to make sure that a copy of the data should still be pulled (the version doesn't
+    to make sure that a copy of the data should still be pulled (the version doesn't 
     match what was requested, or force is True). If the lock file is not
     empty then a previous update of path (pull_data, data_update, or measures_update)
     did not exit as expected and the contents of path are suspect. In that case, pull_data
     will report that as an error and nothing will be updated. The lock file can be checked
     to see the details of when that file was locked. The lock file can be removed and
     pull_data can then be used to install the desired version. It may be safest in that case
-    to remove path completely or use a different path and run pull_data to install
+    to remove path completely or use a different path and run pull_data to install 
     a fresh copy of the desired version.
 
-    Some of the tables installed by pull_data are only read when casatools starts. Use of
-    pull_data should typically be followed by a restart of CASA so that
+    Some of the tables installed by pull_data are only read when casatools starts. Use of 
+    pull_data should typically be followed by a restart of CASA so that 
     any changes are seen by the tools and tasks that use this data.
 
     **Note:** When version is None (the default), data_available is always used to find out
     what versions are available. There is no check on when the data were last updated before
-    calling data_available (as there is in the two update functions).
+    calling data_available (as there is in the two update functions). 
 
     Parameters
        - path (str) - Folder path to place casarundata contents. It must be empty or not exist or contain a valid, previously installed version. If not set then config.measurespath is used.
@@ -96,9 +96,8 @@ def pull_data(path=None, version=None, force=False, logger=None, verbose=None):
     Raises
        - casaconfig.BadLock - raised when the lock file is not empty when a lock is requested
        - casaconfig.BadReadme - raised when the readme.txt file found at path does not contain the expected list of installed files or there was an unexpected change while the data lock is on
-       - casaconfig.NoNetwork - raised where this is no network
        - casaconfig.NotWritable - raised when the user does not have write permission to path
-       - casaconfig.RemoteError - raised by data_available when the list of available data versions could not be fetched for some reason other than no network
+       - casaconfig.RemoteError - raised by data_available when the list of available data versions could not be fetched
        - casaconfig.UnsetMeasurespath - raised when path is None and and measurespath has not been set in config.
 
     """
@@ -132,7 +131,7 @@ def pull_data(path=None, version=None, force=False, logger=None, verbose=None):
     available_data = None
     currentVersion = None
     currentDate = None
-
+    
     # attempt a pull if path does not exist or is empty (except for any lock file, handled later)
     readmeInfo = get_data_info(path, logger, type='casarundata')
     do_pull = readmeInfo is None
@@ -165,11 +164,11 @@ def pull_data(path=None, version=None, force=False, logger=None, verbose=None):
             # this shouldn't happen
             # no lock has been set yet, safe to raise this exception without worrying about the lock
             raise BadReadme('pull_data: the readme.txt file at path did not contain the expected list of installed files')
-
+            
         # the readme file looks as expected, pull if the version is different or force is true
         if version is None:
             # use most recent available
-            # this may raise RemoteError or NoNetwork, no need to catch that here but it may need to be caught upstream
+            # this may raise a RemoteError, no need to catch that here but it may need to be caught upstream
             available_data = data_available()
             version = available_data[-1]
 
@@ -180,16 +179,16 @@ def pull_data(path=None, version=None, force=False, logger=None, verbose=None):
             # safe to return here, no lock has been set
             print_log_messages('pull_data: version is already at the expected version and force is False. Nothing was changed', logger, verbose=verbose)
             return
-
+        
     # a pull will happen, unless the version string is not available
 
     if version is None:
         # need a version, use most recent available
-
+        
         if available_data is None:
-            # this may raise RemoteError or NoNetwork, no need to catch that here but it may need to be caught upstream
+            # this may raise a RemoteError, no need to catch that here but it may need to be caught upstream
             available_data = data_available()
-
+            
         version = available_data[-1]
 
     expectedMeasuresVersion = None
@@ -204,9 +203,9 @@ def pull_data(path=None, version=None, force=False, logger=None, verbose=None):
     else:
         # requested version must be available
         if available_data is None:
-            # this may raise RemoteError or NoNetwork, no need to catch that here but it may need to be caught upstream
+            # this may raise a RemoteError, no need to catch that here but it may need to be caught upstream
             available_data = data_available()
-
+            
         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
@@ -225,10 +224,9 @@ def pull_data(path=None, version=None, force=False, logger=None, verbose=None):
     try:
         print_log_messages('pull_data using version %s, acquiring the lock ... ' % version, logger)
 
-        # 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')
         # the BadLock exception that may happen here is caught below
-
+        
         do_pull = True
         if not force:
             # need to recheck any readme file that may be present here
@@ -299,11 +297,7 @@ def pull_data(path=None, version=None, force=False, logger=None, verbose=None):
         msgs.append('Check for other updates in progress or choose a different path or clear out this path and try again')
         print_log_messages(msgs, logger, True)
         raise
-
-    except NoNetwork as exc:
-        # there is no network, it should be self explanatory so just re-raise it
-        raise
-
+    
     except Exception as exc:
         msgs = []
         msgs.append('ERROR! : Unexpected exception while populating casarundata version %s to %s' % (version, path))
@@ -317,5 +311,5 @@ def pull_data(path=None, version=None, force=False, logger=None, verbose=None):
             if clean_lock:
                 lock_fd.truncate(0)
             lock_fd.close()
-
+        
     return

{casaconfig-1.0.3.dist-info → casaconfig-1.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: casaconfig
-Version: 1.0.3
+Version: 1.1.1
 Summary: CASA Operational Configuration Package
 Author-email: National Radio Astronomy Observatory <casa-feedback@nrao.edu>
 License:                                  Apache License
@@ -212,6 +212,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: certifi>=2023.5.7
+Dynamic: license-file
 
 # casaconfig
 Runtime data necessary for CASA operation.
@@ -264,29 +265,3 @@ dist
 ├── casaconfig-[VERSION]-py3-none-any.whl
 └── casaconfig-[VERSION].tar.gz
 ```
-
-### Setting up CASA branches for casaconfig development
-
-The casaconfig build process publishes test wheels to test.pypi.org
-
-In order to test these with Casa packages, two changes are needed in the casa6 repository branch.
-
-1) Add a line to casa6/build.conf with the appropriate wheel version. For example:
-
-```
-casaconfig==1.0.3.dev2
-```
-2) Add the following line with the apppropriate branch name to casa6/casatools/setup.py
-
-```
-META_DATA["install_requires"] = "casaconfig@git+https://github.com/casangi/casaconfig@CAS-14512"
-```
-
-This adds the casaconfig branch as a casatools install time dependency. It will not use the wheel, but rather build the branch in place. This is required in order to avoid adding test.pypi.org as a pip extra-index-url, which might cause other development packages to be installed inadvertently. Note that casaconfig dependency is typically defined in setup.cfg, but the syntax above does not work with setup.cfg. 
-
-
-### Preparing the casa6 branch for merge
-
-1) Merge the casaconfig branch to main and create a wheel
-2) Update casa6/build.conf to use that wheel
-3) Comment out the extra "install_requires" line from setup.py

{casaconfig-1.0.3.dist-info → casaconfig-1.1.1.dist-info}/RECORD

@@ -1,32 +1,31 @@
 casaconfig/__init__.py,sha256=T-XMwDexm45ndO5gNlpg3kSJoi2EG7TM5VlHHjs70UU,646
-casaconfig/__main__.py,sha256=rmkK1hRFQSwNoVDJ3AV8Ht_36VY4DAceglevbcBNHcA,7541
+casaconfig/__main__.py,sha256=pcuffTdiKEjAkhbQlxGnZzGYf3dSy7CEvWD0kwh7cyU,7440
 casaconfig/config.py,sha256=yIB7h5xwAbK40o7lIAAkXnvmLO_IU9km1XMwdvFx-tg,7172
-casaconfig/private/CasaconfigErrors.py,sha256=5jgBGiFSussmC7tUAA-w0awYx-7hC6Dhv_OXNihJkkY,1519
+casaconfig/private/CasaconfigErrors.py,sha256=21T38zLkoCXz0AYx9liVVffjFPDaV5tBLEn9AcDz4uc,1418
 casaconfig/private/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 casaconfig/private/casasiteconfig_example.py,sha256=J5C9an1iVhxqSbtYT_FiopDXx8SZDcVQkLWKufA_fnc,653
 casaconfig/private/config_defaults.py,sha256=I-bY_rJqP_asidNgdKj4MkPHaY6oQFxgENLsw81mdBw,2054
 casaconfig/private/config_defaults_static.py,sha256=2XwR6FPBMgMVw8hbw-S6OGSlIa3HC4ejyeC1FvIBDAE,2137
-casaconfig/private/data_available.py,sha256=hvQGFix5G4C6iJ3_6v05OqHxqMxzecZwAR0-t9Jlhh0,3768
-casaconfig/private/data_update.py,sha256=Ot9SY4249rfU3CMnyg5LFdB5KfnAZsJoGEuHIT5DGZA,20545
+casaconfig/private/data_available.py,sha256=GNGUgg2V5Y5s2IZWQKaw7zjOFnCi4rEahhH7NI3gaXw,3453
+casaconfig/private/data_update.py,sha256=k3Of7ooftbQUGJZPCL1OzsBn_5AIP8WdKhrG-A6PZ-8,20627
 casaconfig/private/do_auto_updates.py,sha256=sYO5PVG34BXwtHNb8Tawop1Okwt9OTjbSTIwzf0skbs,3418
 casaconfig/private/do_pull_data.py,sha256=F7AXX0py2gNWhCAiOrMUPU5n9gQUACjiyYhdlRp5igM,6574
 casaconfig/private/get_argparser.py,sha256=-pwPMplwBJssSiEOVte89MqBRuxbZ3jLNVluQrv_eGc,1670
 casaconfig/private/get_config.py,sha256=R_6lZ3hp9NNbfBBhrOBBieXDFhR6Q3MdGHSgUwICbzk,1590
 casaconfig/private/get_data_info.py,sha256=onOcl2f0qfxFpQ3DuATh97-Ixr4IcBGtlZzNspROtPQ,12467
-casaconfig/private/get_data_lock.py,sha256=JysF75EHwP2FErjffMkfeV-9wy5wJJ9irPDrMvVzSIo,3809
-casaconfig/private/have_network.py,sha256=zCIbABTG_9ew9Ac3eb8ggNaZ_H61m_G4LCXkFZe7q5M,1410
+casaconfig/private/get_data_lock.py,sha256=r2sju4havqRRDaLRbD6aHAKulemuVWH0D16r77xTYjQ,3347
 casaconfig/private/io_redirect.py,sha256=9mwl2siS3fFYCEi_u9Mojg7cBtBgzW00mc8H7V1NSEs,2879
-casaconfig/private/measures_available.py,sha256=OWYmSSUhDqeOGHXBBd6Fwb74O0iJdq8LZx3vIjQNjq4,2343
-casaconfig/private/measures_update.py,sha256=xs84pMWG2263qLlz1y4cFTdUH32QR7ZYxJM3TdhiyRk,21018
+casaconfig/private/measures_available.py,sha256=wUJtbQLecdLCtq3x-HMjjOpwu7Fl4Nwp41R7-Uj0zVQ,3235
+casaconfig/private/measures_update.py,sha256=sidF8nNqoHNXTFPgiBQujqM9iwPNqVkiLsbAsD6VJWc,21623
 casaconfig/private/print_log_messages.py,sha256=mZNSxHBgrSz7KTkCEdRgxohSuAPWSgKpF_06sIuyft0,2204
-casaconfig/private/pull_data.py,sha256=nYYQLxlf4F6_8uzchfmHn6WvYV4wzjOP58_kc8uZYXk,17385
+casaconfig/private/pull_data.py,sha256=vqL607amPiAK2fOvG14wVrxFXZYaWUw3TqbMSOWstC4,17063
 casaconfig/private/read_readme.py,sha256=T9mcG5KhQIHM6N9AgW4XJ2nKsHtI1Fa3iDgr8xMABLM,2137
 casaconfig/private/set_casacore_path.py,sha256=yLAh4tNoUbWczuCIVpIJx6nx8p9jRm0lUjexrpMhA-A,2240
 casaconfig/private/summary.py,sha256=jUtc5uLnEk1kljPpZa3UimhJAqVnDzMPUCD7OOznohE,3448
 casaconfig/private/update_all.py,sha256=57ynk0JJqyMpS1ABmma7F-kFSEnbhU4ZvoSuXQdEJrQ,5501
-tests/test_casaconfig.py,sha256=yeycDBOzwHsDeYAyIEmj1RNsZ3k6l7SYXFY-p2F1l7A,43963
-casaconfig-1.0.3.dist-info/LICENSE,sha256=OMpzmn2zUn6I4jmVqs1Coa_0NJcoJC9eweZ2gx-u0oI,11358
-casaconfig-1.0.3.dist-info/METADATA,sha256=X4RtDt_jfWAxgdJeUB8mpHOY2YCt0FTPWtoaal2xC2A,16959
-casaconfig-1.0.3.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-casaconfig-1.0.3.dist-info/top_level.txt,sha256=Uay9WTPz644aHfLbmj47WXzue19HtKRueFFCXu1N1Co,17
-casaconfig-1.0.3.dist-info/RECORD,,
+casaconfig-1.1.1.dist-info/licenses/LICENSE,sha256=OMpzmn2zUn6I4jmVqs1Coa_0NJcoJC9eweZ2gx-u0oI,11358
+tests/test_casaconfig.py,sha256=Xmn2hbw0SQ2PJ9BzQCg33EKB4413jvs0qHj5k4Rmfnk,42214
+casaconfig-1.1.1.dist-info/METADATA,sha256=O5HBW6FR3CJKfep0piHJjLLom-9KtUjNxXtotlk3tZA,15821
+casaconfig-1.1.1.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+casaconfig-1.1.1.dist-info/top_level.txt,sha256=Uay9WTPz644aHfLbmj47WXzue19HtKRueFFCXu1N1Co,17
+casaconfig-1.1.1.dist-info/RECORD,,

{casaconfig-1.0.3.dist-info → casaconfig-1.1.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.2)
+Generator: setuptools (79.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tests/test_casaconfig.py

@@ -750,44 +750,6 @@ class casaconfig_test(unittest.TestCase):
         # these tests requires an already installed set of data
         self.populate_testrundata()
 
-        # BadLock
-        print("\nTesting for BadLock in test_exceptions_with_data")
-        # insert a non-empty lock file
-        exceptionSeen = False
-        lockPath = os.path.join(self.testRundataPath,'data_update.lock')
-        with open(lockPath,'w') as f:
-            f.write("test lock file, not empty")
-
-        # with measures_update
-        try:
-            exceptionSeen = False
-            # try to install an older measures, should fail because of the lock file
-            ma = casaconfig.measures_available()
-            casaconfig.measures_update(self.testRundataPath, version=ma[0])
-        except casaconfig.BadLock as exc:
-            exceptionSeen = True
-        except Exception as exc:
-            print("unexepected exception seen while testing for expected BadLock exception in measures_update")
-            print(str(exc))
-        self.assertTrue(exceptionSeen, "BadLock not seen as expected in measures_update with existing data test in")
-        
-        # with data_update
-        try:
-            exceptionSeen = False
-            # try to install an older measures, should fail because of the lock file
-            da = casaconfig.data_available()
-            casaconfig.data_update(self.testRundataPath, version=da[0])
-        except casaconfig.BadLock as exc:
-            exceptionSeen = True
-        except Exception as exc:
-            print("unexepected exception seen while testing for expected BadLock exception in data_update")
-            print(str(exc))
-        self.assertTrue(exceptionSeen, "BadLock not seen as expected in data_update with existing data test")
-        # remove the lock file
-        os.remove(lockPath)
-        print("BadLock test passed in test_exceptions_with_data\n")
-            
-
         # BadReadme
 
         # create a bad data readme.txt file from the valid one

casaconfig/private/have_network.py

@@ -1,40 +0,0 @@
-# Copyright 2025 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.
-
-import urllib.request
-import urllib.error
-
-def have_network():
-    """
-    check to see if an active network with general internet connectivity
-    is available. returns True if we have internet connectivity and
-    False if we do not.
-    """
-    ###
-    ### see: https://stackoverflow.com/questions/50558000/test-internet-connection-for-python3
-    ###
-    ### copied from in casagui/utils/__init__.py
-    ###
-    try:
-        with urllib.request.urlopen('http://clients3.google.com/generate_204') as response:
-            return response.status == 204
-    except urllib.error.HTTPError:
-        ### http error
-        return False
-    except urllib.error.ContentTooShortError:
-        return False
-    except urllib.error.URLError:
-        return False
-    except Exception:
-        return False