casaconfig 0.0.69__tar.gz → 0.0.71__tar.gz

{casaconfig-0.0.69/casaconfig.egg-info → casaconfig-0.0.71}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: casaconfig
-Version: 0.0.69
+Version: 0.0.71
 Summary: CASA Operational Configuration Package
 Home-page: https://github.com/casangi/casaconfig
 Author: National Radio Astronomy Observatory
@@ -27,9 +27,9 @@ Description: # casaconfig
         
         ## Usage
         
-        The Python package installs with an empty ```__data__``` subdirectory. The
-        contents must be populated by calling ```pull_data()``` to download the tables
-        from the Github repo ```data``` folder.
+        CASA (modular and monolithic) does not come with any data. It must be populated
+        by calling ```pull_data()``` to download the tables. The default location is
+        ```~/.casa/data```. The ```path``` argument can be used to populate a different location.
         
         ```python
         from casaconfig import pull_data
@@ -37,37 +37,53 @@ Description: # casaconfig
         ```
         
         Within this folder is a stale version of the IERS measures tables needed for accurate measurement. 
-        Generally users will want to update to the latest measures data and keep current each day.
+        Generally users will want to update to the latest measures data and keep current each day. 
         
         ```python
         from casaconfig import measures_update
         measures_update()
         ```
         
-        A default config.py necessary for CASA operation is included in this package. Users may make their
-        own local copy with any desired modifications.
+        The update_all function updates or installs the data and the latest measures tables.
         
         ```python
-        from casaconfig import write_default_config
-        write_default_config('~/.casa/config.py')
+        from casaconfig import update_all
+        update_all()
         ```
         
+        A default config.py necessary for CASA operation is included in this package. Users
+        provide their own config.py (default at ~/.casa/config.py) if they want to change
+        any of the default values (only the values they want to change need be provided in
+        that file). 
+        
+        The default config values are shown here (path's are expanded using expanduser and abspath).
+        
         ```
         $: cat ~/.casa/config.py
         
         import os, time, pkg_resources
         
-        # list of paths where CASA should search for data subdirectories
-        datapath = [pkg_resources.resource_filename('casaconfig', '__data__/')]
+        # location of geodetic and ephemera data, default path for casaconfig data functions
+        measurespath = "~/.casa/data"
+        
+        # search path for measurement sets and images to load, when empty then [measurespath] is used
+        datapath = [ ]
         
-        # location of required runtime measures data, takes precedence over location(s) in datapath list
-        measurespath = os.path.expanduser("~/.casa/measures")
+        # automatically update measures data if not current (measurespath must be owned by the user)
+        # when data_auto_update is True then measures_auto_update MUST also be True
+        measures_auto_update = True
         
-        # automatically update measures data if not current (measurespath must be user-writable)
-        measures_update = True
+        # automatically update casarundata and measures data if not current (measurespath must be owned by the user)
+        data_auto_update = True
+        
+        # location of the optional user's startup.py
+        startupfile = '~/.casa/startup.py'
+        
+        # location of the cachedir
+        cachedir = '~/.casa'
         
         # log file path/name
-        logfile='casalog-%s.log' % time.strftime("%Y-%m-%d", time.localtime())
+        logfile='casa-%s.log' % time.strftime("%Y-%m-%d", time.gmtime())
         
         # do not create a log file when True, If True, then any logfile value is ignored and there is no log file
         nologfile = False
@@ -83,7 +99,7 @@ Description: # casaconfig
         
         # the IPython prompt color scheme. Must be one of "Neutral", "NoColor", "Linux" or "LightBG", default "Neutral"
         # if an invalid color is given a warning message is printed and logged but CASA continues using the default color
-        colors = "LightBG"
+        colors = "Neutral"
         
         # startup without a graphical backend if True
         agg = False
@@ -96,25 +112,7 @@ Description: # casaconfig
         iplog = True
         
         # IPython log path/name used when iplog is True
-        iplogfile = 'ipython-%s.log' % time.strftime("%Y-%m-%d", time.localtime())
-        
-        # allow anonymous usage reporting
-        telemetry_enabled = True
-        
-        # location to place telemetry data prior to reporting
-        telemetry_log_directory = os.path.expanduser("~/.casa/telemetry")
-        
-        # maximum size of telemetry recording
-        telemetry_log_limit = 1650
-        
-        # telemetry recording size that triggers a report
-        telemetry_log_size_interval = 30
-        
-        # telemetry recording report frequency
-        telemetry_submit_interval = 20
-        
-        # allow anonymous crash reporting
-        crashreporter_enabled = True
+        iplogfile = 'ipython-%s.log' % time.strftime("%Y-%m-%d", time.gmtime())
         
         # include the users local site-packages in the python path if True. 
         # normally these are excluded to avoid any conflicts with CASA modules

{casaconfig-0.0.69 → casaconfig-0.0.71}/README.md

@@ -19,9 +19,9 @@ $: pip install casaconfig
 
 ## Usage
 
-The Python package installs with an empty ```__data__``` subdirectory. The
-contents must be populated by calling ```pull_data()``` to download the tables
-from the Github repo ```data``` folder.
+CASA (modular and monolithic) does not come with any data. It must be populated
+by calling ```pull_data()``` to download the tables. The default location is
+```~/.casa/data```. The ```path``` argument can be used to populate a different location.
 
 ```python
 from casaconfig import pull_data
@@ -29,37 +29,53 @@ pull_data()
 ```
 
 Within this folder is a stale version of the IERS measures tables needed for accurate measurement. 
-Generally users will want to update to the latest measures data and keep current each day.
+Generally users will want to update to the latest measures data and keep current each day. 
 
 ```python
 from casaconfig import measures_update
 measures_update()
 ```
 
-A default config.py necessary for CASA operation is included in this package. Users may make their
-own local copy with any desired modifications.
+The update_all function updates or installs the data and the latest measures tables.
 
 ```python
-from casaconfig import write_default_config
-write_default_config('~/.casa/config.py')
+from casaconfig import update_all
+update_all()
 ```
 
+A default config.py necessary for CASA operation is included in this package. Users
+provide their own config.py (default at ~/.casa/config.py) if they want to change
+any of the default values (only the values they want to change need be provided in
+that file). 
+
+The default config values are shown here (path's are expanded using expanduser and abspath).
+
 ```
 $: cat ~/.casa/config.py
 
 import os, time, pkg_resources
 
-# list of paths where CASA should search for data subdirectories
-datapath = [pkg_resources.resource_filename('casaconfig', '__data__/')]
+# location of geodetic and ephemera data, default path for casaconfig data functions
+measurespath = "~/.casa/data"
+
+# search path for measurement sets and images to load, when empty then [measurespath] is used
+datapath = [ ]
 
-# location of required runtime measures data, takes precedence over location(s) in datapath list
-measurespath = os.path.expanduser("~/.casa/measures")
+# automatically update measures data if not current (measurespath must be owned by the user)
+# when data_auto_update is True then measures_auto_update MUST also be True
+measures_auto_update = True
 
-# automatically update measures data if not current (measurespath must be user-writable)
-measures_update = True
+# automatically update casarundata and measures data if not current (measurespath must be owned by the user)
+data_auto_update = True
+
+# location of the optional user's startup.py
+startupfile = '~/.casa/startup.py'
+
+# location of the cachedir
+cachedir = '~/.casa'
 
 # log file path/name
-logfile='casalog-%s.log' % time.strftime("%Y-%m-%d", time.localtime())
+logfile='casa-%s.log' % time.strftime("%Y-%m-%d", time.gmtime())
 
 # do not create a log file when True, If True, then any logfile value is ignored and there is no log file
 nologfile = False
@@ -75,7 +91,7 @@ nogui = False
 
 # the IPython prompt color scheme. Must be one of "Neutral", "NoColor", "Linux" or "LightBG", default "Neutral"
 # if an invalid color is given a warning message is printed and logged but CASA continues using the default color
-colors = "LightBG"
+colors = "Neutral"
 
 # startup without a graphical backend if True
 agg = False
@@ -88,25 +104,7 @@ pipeline = False
 iplog = True
 
 # IPython log path/name used when iplog is True
-iplogfile = 'ipython-%s.log' % time.strftime("%Y-%m-%d", time.localtime())
-
-# allow anonymous usage reporting
-telemetry_enabled = True
-
-# location to place telemetry data prior to reporting
-telemetry_log_directory = os.path.expanduser("~/.casa/telemetry")
-
-# maximum size of telemetry recording
-telemetry_log_limit = 1650
-
-# telemetry recording size that triggers a report
-telemetry_log_size_interval = 30
-
-# telemetry recording report frequency
-telemetry_submit_interval = 20
-
-# allow anonymous crash reporting
-crashreporter_enabled = True
+iplogfile = 'ipython-%s.log' % time.strftime("%Y-%m-%d", time.gmtime())
 
 # include the users local site-packages in the python path if True. 
 # normally these are excluded to avoid any conflicts with CASA modules

{casaconfig-0.0.69 → casaconfig-0.0.71}/casaconfig/__main__.py

@@ -18,9 +18,9 @@ parser.add_argument( "--data-update", dest='dataupdate', action='store_const', c
 parser.add_argument( "--measures-update", dest='measuresupdate', action='store_const', const=True, default=False,
                      help="invoke measures_update() to update measurespath to the latest measures data")
 parser.add_argument( "--update-all", dest='updateall', action='store_const', const=True, default=False,
-                     help="invokes data_update then measures_update to update measurespath to the latest casarundata and measures data")
+                     help="invoke update_all() to populate (update) measurespath with the latest casarundata and measures data")
 parser.add_argument( "--reference-testing", action='store_const', const=True, dest='referencetesting', default=False,
-                     help="set measurespath to the casarundata when this version of casa was produced, used for testing purposes")
+                     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")
 

{casaconfig-0.0.69 → casaconfig-0.0.71}/casaconfig/config.py

@@ -97,16 +97,16 @@ if len(_config_defaults.datapath) == 0:
         _config_defaults.datapath = [ _config_defaults.measurespath ]
 
 # the names of config values that are path that need to be expanded here
-__path_names = ["cachedir","datapath","measurespath","logfile","iplogfile","startupfile","telemetry_log_directory"]
+__path_names = ["cachedir","datapath","measurespath","logfile","iplogfile","startupfile"]
 
 for __v in __defaults:
     globals()[__v] = getattr(_config_defaults,__v,None)
     if (__v in __path_names) :
         # expand ~ or ~user constructs and make sure they are absolute paths
         if (type(globals()[__v]) is list) :
-            vlist = list(map(__os.path.expanduser, globals()[__v]))
-            vlist = list(map(__os.path.abspath,vlist))
-            globals()[__v] = vlist
+            __vlist = list(map(__os.path.expanduser, globals()[__v]))
+            __vlist = list(map(__os.path.abspath,__vlist))
+            globals()[__v] = __vlist
         else:
             globals()[__v] = __os.path.abspath(__os.path.expanduser(globals()[__v]))
                                              

{casaconfig-0.0.69 → casaconfig-0.0.71}/casaconfig/private/config_defaults_static.py

@@ -1,7 +1,7 @@
-# search path for measurement sets and images to load, when empty then [measurespath] is used
+# lsit of paths where CASA should search for data subdirectories. Default [measurespath].
 datapath = [ ]
 
-# location of geodetic and ephemera data, default path for casaconfig data functions
+# location of required measures data, takes precedence over any measures data also present in datapath.
 measurespath = "~/.casa/data"
 
 # automatically update measures data if not current (measurespath must be owned by the user)
@@ -26,19 +26,21 @@ nologfile = False
 # print log output to terminal when True (in addition to any logfile and CASA logger)
 log2term = False
 
-# do not start the CASA logger when True
+# do not start the CASA logger GUI when True
 nologger = False
 
 # avoid starting GUI tools when True. If True then the CASA logger is not started even if nologger is False
 nogui = False
 
 # the IPython prompt color scheme. Must be one of "Neutral", "NoColor", "Linux" or "LightBG", default "Neutral"
+# if an invalid color is given a warning message is printed and logged but CASA continues using the default color
 colors = "Neutral"
 
 # startup without a graphical backend if True
 agg = False
 
 # attempt to load the pipeline modules and set other options appropriate for pipeline use if True
+# when pipeline is True then agg will be assumed to be true even if agg is set to False here or on the command line
 pipeline = False
 
 # create and use an IPython log using the iplogfile path
@@ -47,23 +49,5 @@ iplog = False
 # the IPython log file path name to be used when iplog is True
 iplogfile='ipython-%s.log' % _time.strftime("%Y%m%d-%H%M%S", _time.gmtime())
 
-# allow anonymous usage reporting
-telemetry_enabled = True
-
-# location to place telemetry data prior to reporting
-telemetry_log_directory = '~/.casa/telemetry'
-
-# maximum size of telemetry recording
-telemetry_log_limit = 20480
-
-# telemetry recording size that triggers a report
-telemetry_log_size_interval = 60
-
-# telemetry recording report frequency
-telemetry_submit_interval = 604800
-
-# allow anonymous crash reporting
-crashreporter_enabled = True
-
 # include the user's local site-packages in the python path if True. May conflict with CASA modules
 user_site = False

{casaconfig-0.0.69 → casaconfig-0.0.71}/casaconfig/private/data_update.py

@@ -15,7 +15,7 @@
 this module will be included in the api
 """
 
-def data_update(path=None, auto_update_rules=False, version=None, force=False, logger=None):
+def data_update(path=None, version=None, force=False, logger=None, auto_update_rules):
     """
     Check for updates to the installed casarundata and install the update or change to 
     the requested version when appropriate.
@@ -25,25 +25,26 @@ def data_update(path=None, auto_update_rules=False, version=None, force=False, l
     must already exist in path in order to use this function. Use pull_data to install
     casarundata into a new location.
 
-    If path is None then config.measurespath will be used.
+    If path is None then config.measurespath is used.
 
     If the version is None (the default) then the most recent version returned by 
     data_available is used.
 
-    If the version requested matches the one in that text file then this function does
+    If the version requested matches the one in the readme.txt file at path then this function does
     nothing unless force is True.
 
-    If a specific version is not requested (the default) and the date in that text file
-    is today, then this function does nothing unless force is True even if there is a more
+    If a specific version is not requested (the default) and the date in the readme.txt file
+    at path is today, then this function does nothing unless force is True even if there is a more
     recent version available from the CASA server.
 
     When auto_update_rules is True then path must be owned by the user, force must be
-    False and the version must be None. This is used by casatools initialization when
-    data_auto_update is True.
+    False and the version must be None. This is used during casatools initialization when
+    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, will first be removed and then all of the contents of the version 
-    being installed by the update are installed. This includes the set of measures tables
+    readme.txt file at path, are removed before the contents of the version 
+    being installed are unpacked. This includes the set of measures tables
     that are part of that casarundata version. A data update is typically followed by a
     measures_update to ensure that the most recent measures data are installed.
 
@@ -72,14 +73,14 @@ def data_update(path=None, auto_update_rules=False, version=None, force=False, l
     write permissions there). The version must then also be None and the force option must be False.
 
     **Note:** the most recent casarundata may not include the most recent measures data. A data_update
-    is typically followed by a measures update.
+    is typically followed by a measures_update.
 
     Parameters
        - path (str) - Folder path to update. Must contain a valid readme.txt. If not set then config.measurespath is used.
-       - 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.
        - version (str=None) - Version of casarundata to retrieve (usually in the form of casarundata-x.y.z.tar.gz, see data_available()). Default None retrieves the latest.
        - force (bool=False) - If True, always re-download the casarundata. Default False will not download casarundata if already updated today 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.
         
     Returns
        None

{casaconfig-0.0.69 → casaconfig-0.0.71}/casaconfig/private/do_pull_data.py

@@ -90,36 +90,38 @@ def do_pull_data(path, version, installed_files, logger):
         # also log it
         if logger is not None: logger.post('downloading casarundata contents to %s ...' % path, 'INFO')
         tar.extractall(path=path)
-        print("done", file=sys.stdout)
-        # the tarball has been extracted to path/version
-        # get the instaled files of files to be written to the readme file
-        versdir = os.path.join(path,version[:version.index('.tar')])
-        installed_files = []
-        wgen = os.walk(versdir)
-        for (dirpath, dirnames, filenames) in wgen:
-            for f in filenames:
-                installed_files.append(os.path.relpath(os.path.join(dirpath,f),versdir))
+        
+    print("done", file=sys.stdout)
+        
+    # the tarball has been extracted to path/version
+    # get the instaled files of files to be written to the readme file
+    versdir = os.path.join(path,version[:version.index('.tar')])
+    installed_files = []
+    wgen = os.walk(versdir)
+    for (dirpath, dirnames, filenames) in wgen:
+        for f in filenames:
+            installed_files.append(os.path.relpath(os.path.join(dirpath,f),versdir))
                 
-        # move everything in version up a level to path
-        for f in os.listdir(versdir):
-            srcPath = os.path.join(versdir,f)
-            if os.path.isdir(srcPath):
-                # directories are first copied, then removed
-                # existing directories are reused, existing files are overwritten
-                # things in path that do not exist in srcPath are not changed
-                shutil.copytree(srcPath,os.path.join(path,f),dirs_exist_ok=True)
-                shutil.rmtree(srcPath)
-            else:
-                # assume it's a simple file, these can be moved directly, overwriting anything already there
-                os.rename(srcPath,os.path.join(path,f))
+    # move everything in version up a level to path
+    for f in os.listdir(versdir):
+        srcPath = os.path.join(versdir,f)
+        if os.path.isdir(srcPath):
+            # directories are first copied, then removed
+            # existing directories are reused, existing files are overwritten
+            # things in path that do not exist in srcPath are not changed
+            shutil.copytree(srcPath,os.path.join(path,f),dirs_exist_ok=True)
+            shutil.rmtree(srcPath)
+        else:
+            # assume it's a simple file, these can be moved directly, overwriting anything already there
+            os.rename(srcPath,os.path.join(path,f))
                         
-        # safe to remove versdir, it would be a surprise if it's not empty
-        os.rmdir(versdir)
-        # update the readme.txt file
-        with open(readme_path,'w') as fid:
-            fid.write("# casarundata populated by casaconfig.pull_data\nversion : %s\ndate : %s" % (version, datetime.today().strftime('%Y-%m-%d')))
-            fid.write("\n#\n# manifest")
-            for f in installed_files:
-                fid.write("\n%s" % f)
+    # safe to remove versdir, it would be a surprise if it's not empty
+    os.rmdir(versdir)
+    # update the readme.txt file
+    with open(readme_path,'w') as fid:
+        fid.write("# casarundata populated by casaconfig.pull_data\nversion : %s\ndate : %s" % (version, datetime.today().strftime('%Y-%m-%d')))
+        fid.write("\n#\n# manifest")
+        for f in installed_files:
+            fid.write("\n%s" % f)
 
     print_log_messages('casarundata installed %s at %s' % (version, path), logger)

casaconfig-0.0.71/casaconfig/private/get_config.py

@@ -0,0 +1,20 @@
+def get_config( default=False ):
+    """
+    Get configuration values as a list of strings which can be logged, stored, or evaluated.
+
+    The default values (returned when default is True) are the configuration values after all config files have been evaluated but before the path values have been expanded using os.path.expanduser and os.path.abspath. Modules that use the command line to change config values may also not update the default values. User actions in a CASA session will also typically not change the default values.
+
+    Parameters
+       default (bool=False) - If True, return the default values.
+
+    Returns
+       list[str] - list of configuration strings
+    """
+
+    from .. import config as _config
+    if not default :
+        valsObj = _config
+    else:
+        valsObj = _config._config_defaults
+
+    return list( map( lambda name: f'{name} = {repr(getattr(valsObj,name))}', _config.__defaults ) )

{casaconfig-0.0.69 → casaconfig-0.0.71}/casaconfig/private/get_data_info.py

@@ -33,8 +33,8 @@ def get_data_info(path=None, logger=None):
     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
-    casarundata version for testing purposes. The release information comes from the
-    casaconfig module and does not depend on the path argument.
+    casarundata version for testing purposes. The release information does not depend 
+    on the path argument.
 
     If path is empty or does not exist then the return value for the 'casarundata' and
     'measures' types is None.
@@ -49,9 +49,9 @@ def get_data_info(path=None, logger=None):
     and ephemeris directories are present in path then the version returned for 'measures' is
     'unknown' and the date is an empty string. The path location may contain measures data from
     a legacy installation of CASA data. CASA may be able to use any measures tables at this
-    location by they may not be maintained by casaconfig.
+    location by they can not be maintained by casaconfig.
 
-    If 'release_data_readme.txt' file is not found with the casaconfig module the returned
+    If no casadata release information is found 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.
 
@@ -63,7 +63,7 @@ def get_data_info(path=None, logger=None):
        - logger (casatools.logsink=None) - Instance of the casalogger to use for writing messages. Default None writes messages to the the terminal.
     
     Returns
-       dict - a dictionary by type, 'casarundata', 'measures', 'release' where each type is a dictionary 'version', 'date'. A return value of None indicates path is unset. A value of None for that type means no information could be found about that type.
+       dict - a dictionary by type, 'casarundata', 'measures', 'release' where each type is a dictionary containing 'version' and 'date'. A return value of None indicates path is unset. A value of None for that type means no information could be found about that type.
     """
 
     # when None is returned, path wasn't set

{casaconfig-0.0.69 → casaconfig-0.0.71}/casaconfig/private/measures_update.py

@@ -15,7 +15,7 @@
 this module will be included in the api
 """
 
-def measures_update(path=None, auto_update_rules=False, version=None, force=False, logger=None):
+def measures_update(path=None, version=None, force=False, logger=None, auto_update_rules=False):
     """
     Retrieve IERS data used for measures calculations from ASTRON server
     
@@ -27,7 +27,7 @@ def measures_update(path=None, auto_update_rules=False, version=None, force=Fals
     A text file (readme.txt in the geodetic directory in path) records the version string
     and the date when that version was installed in path.
 
-    If path is None then config.measurespath will be used.
+    If path is None then config.measurespath is used.
 
     If the version requested matches the one in that text file then this function does
     nothing unless force is True.
@@ -36,18 +36,26 @@ def measures_update(path=None, auto_update_rules=False, version=None, force=Fals
     is today, then this function does nothing unless force is True even if there is a more
     recent version available from the ASTRON server.
 
-    Automatic updating (when the measures_auto_update config value is True) uses this
-    function as the casatools module is starting so that the updated measures are in
-    place before any tool needs to use them. 
+    When auto_update_rules is True then path must be owned by the user, force must be False,
+    and the version must be None. This is used during casatools initialization when 
+    measures_auto_update is True. Automatic updating happens during casatools initialization
+    so that the updated measures are in place before any tool needs to use them.
 
     Using measures_update after casatools has started should always be followed by exiting 
     and restarting casa (or the casatools module if modular casa components are being used).
 
-    A file lock is used to prevent more that one measures_update and data_update from updating
-    the measures files in path at the same time. When locked, the lock file (data_update.lock 
-    in path) will contain information about the process that has the lock. When a measures_update
-    gets the lock it will check the readme.txt file in the geodetic directory in path
-    to make sure that an update is still necessary (if force is True an update always happens).
+    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 
+    lock file (data_update.lock in path) contains information about the process that
+    has the lock. When measures_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 
+    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 and the contents of path are
+    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 measures_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.
 
     Care should be used when using measures_update outside of the normal automatic
     update that other casa sessions are not using the same measures at the same time,
@@ -72,10 +80,10 @@ def measures_update(path=None, auto_update_rules=False, version=None, force=Fals
 
     Parameters
        - path (str) - Folder path to place updated measures data. Must contain a valid geodetic/readme.txt. If not set then config.measurespath is used.
-       - 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.
        - 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.
        - force (bool=False) - If True, always re-download the measures data. Default False will not download measures data if already updated today 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.
         
     Returns
        None
@@ -214,7 +222,7 @@ def measures_update(path=None, auto_update_rules=False, version=None, force=Fals
                     print_log_messages('measures_update downloading %s from ASTRON server to %s ...' % (target, path), logger)
                     ftp.retrbinary('RETR ' + target, fid.write)
 
-                    ftp.close()
+                ftp.close()
     
                 # extract from the fetched tarfile
                 with tarfile.open(os.path.join(path,'measures.ztar'),mode='r:gz') as ztar:

{casaconfig-0.0.69 → casaconfig-0.0.71}/casaconfig/private/pull_data.py

@@ -17,9 +17,9 @@ this module will be included in the api
 
 def pull_data(path=None, version=None, force=False, logger=None):
     """
-    Pull the package data contents from the CASA host and install it in path.
+    Pull the casarundata contents from the CASA host and install it in path.
 
-    The path must either contain a previously installed version of the package data 
+    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.
@@ -36,7 +36,7 @@ def pull_data(path=None, version=None, force=False, logger=None):
     version already matches what was previously installed (no installation is then
     necessary unless force is True).
 
-    The measures tables included in the package data will typically 
+    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.
 
@@ -53,12 +53,12 @@ def pull_data(path=None, version=None, force=False, logger=None):
     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 be then be used to install the desired version. It may be safest in that case
+    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 
     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 after CASA has started should typically be followed by a restart so that 
+    pull_data should typically be followed of CASA by a restart so that 
     any changes are seen by the tools and tasks that use this data.
 
     Parameters

{casaconfig-0.0.69 → casaconfig-0.0.71/casaconfig.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: casaconfig
-Version: 0.0.69
+Version: 0.0.71
 Summary: CASA Operational Configuration Package
 Home-page: https://github.com/casangi/casaconfig
 Author: National Radio Astronomy Observatory
@@ -27,9 +27,9 @@ Description: # casaconfig
         
         ## Usage
         
-        The Python package installs with an empty ```__data__``` subdirectory. The
-        contents must be populated by calling ```pull_data()``` to download the tables
-        from the Github repo ```data``` folder.
+        CASA (modular and monolithic) does not come with any data. It must be populated
+        by calling ```pull_data()``` to download the tables. The default location is
+        ```~/.casa/data```. The ```path``` argument can be used to populate a different location.
         
         ```python
         from casaconfig import pull_data
@@ -37,37 +37,53 @@ Description: # casaconfig
         ```
         
         Within this folder is a stale version of the IERS measures tables needed for accurate measurement. 
-        Generally users will want to update to the latest measures data and keep current each day.
+        Generally users will want to update to the latest measures data and keep current each day. 
         
         ```python
         from casaconfig import measures_update
         measures_update()
         ```
         
-        A default config.py necessary for CASA operation is included in this package. Users may make their
-        own local copy with any desired modifications.
+        The update_all function updates or installs the data and the latest measures tables.
         
         ```python
-        from casaconfig import write_default_config
-        write_default_config('~/.casa/config.py')
+        from casaconfig import update_all
+        update_all()
         ```
         
+        A default config.py necessary for CASA operation is included in this package. Users
+        provide their own config.py (default at ~/.casa/config.py) if they want to change
+        any of the default values (only the values they want to change need be provided in
+        that file). 
+        
+        The default config values are shown here (path's are expanded using expanduser and abspath).
+        
         ```
         $: cat ~/.casa/config.py
         
         import os, time, pkg_resources
         
-        # list of paths where CASA should search for data subdirectories
-        datapath = [pkg_resources.resource_filename('casaconfig', '__data__/')]
+        # location of geodetic and ephemera data, default path for casaconfig data functions
+        measurespath = "~/.casa/data"
+        
+        # search path for measurement sets and images to load, when empty then [measurespath] is used
+        datapath = [ ]
         
-        # location of required runtime measures data, takes precedence over location(s) in datapath list
-        measurespath = os.path.expanduser("~/.casa/measures")
+        # automatically update measures data if not current (measurespath must be owned by the user)
+        # when data_auto_update is True then measures_auto_update MUST also be True
+        measures_auto_update = True
         
-        # automatically update measures data if not current (measurespath must be user-writable)
-        measures_update = True
+        # automatically update casarundata and measures data if not current (measurespath must be owned by the user)
+        data_auto_update = True
+        
+        # location of the optional user's startup.py
+        startupfile = '~/.casa/startup.py'
+        
+        # location of the cachedir
+        cachedir = '~/.casa'
         
         # log file path/name
-        logfile='casalog-%s.log' % time.strftime("%Y-%m-%d", time.localtime())
+        logfile='casa-%s.log' % time.strftime("%Y-%m-%d", time.gmtime())
         
         # do not create a log file when True, If True, then any logfile value is ignored and there is no log file
         nologfile = False
@@ -83,7 +99,7 @@ Description: # casaconfig
         
         # the IPython prompt color scheme. Must be one of "Neutral", "NoColor", "Linux" or "LightBG", default "Neutral"
         # if an invalid color is given a warning message is printed and logged but CASA continues using the default color
-        colors = "LightBG"
+        colors = "Neutral"
         
         # startup without a graphical backend if True
         agg = False
@@ -96,25 +112,7 @@ Description: # casaconfig
         iplog = True
         
         # IPython log path/name used when iplog is True
-        iplogfile = 'ipython-%s.log' % time.strftime("%Y-%m-%d", time.localtime())
-        
-        # allow anonymous usage reporting
-        telemetry_enabled = True
-        
-        # location to place telemetry data prior to reporting
-        telemetry_log_directory = os.path.expanduser("~/.casa/telemetry")
-        
-        # maximum size of telemetry recording
-        telemetry_log_limit = 1650
-        
-        # telemetry recording size that triggers a report
-        telemetry_log_size_interval = 30
-        
-        # telemetry recording report frequency
-        telemetry_submit_interval = 20
-        
-        # allow anonymous crash reporting
-        crashreporter_enabled = True
+        iplogfile = 'ipython-%s.log' % time.strftime("%Y-%m-%d", time.gmtime())
         
         # include the users local site-packages in the python path if True. 
         # normally these are excluded to avoid any conflicts with CASA modules

{casaconfig-0.0.69 → casaconfig-0.0.71}/setup.py

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

casaconfig-0.0.69/casaconfig/private/get_config.py

@@ -1,20 +0,0 @@
-def get_config( default=False ):
-    """
-    Get configuration values as strings which can be logged, stored or evaluated.
-
-    The default values (returned with default is True) are the config values after all config files have been evaluated but before the path values have been expanded using os.path.expanduser and os.path.abspath. Modules that use the command line to change config values may also not update the default values. User actions in a CASA session will also typically not change the default values.
-
-    Parameters
-       default (bool=False) - If True, return the default values.
-
-    Returns
-       list[str] - list of configuration strings
-    """
-
-    from .. import config as _config
-    if not default :
-        valsObj = _config
-    else:
-        valsObj = _config._config_defaults
-
-    return list( map( lambda name: f'{name} = {repr(getattr(valsObj,name))}', _config.__defaults ) )