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

casaconfig/private/read_readme.py

@@ -16,45 +16,89 @@ def read_readme(path):
     """
     Read and parse the contents of a readme.txt file used by casaconfig.
 
-    A dictionary containing the 'version', 'date', and 'extra' (containing
+    A dictionary containing the 'version', 'date', 'site', and 'extra' (containing
     a list of optional extra lines found). On error, the return values is None.
 
     The extra lines are stripped and do not include lines begining with '#'
 
     The format is assumed to be:
         a line begining with #, which is ignored.
+        a line "site: the site url string"
         a line "version : the versions string"
         a line "date : the date"
         optional extra lines (the manifest of installed files for the main readme)
 
-    The version string and date are stripped of leading and trailing whitespace.
+    The version, site and date strings are stripped of leading and trailing whitespace.
+
+    The site string only appears in measures data and is missing is early readme
+    files for measures data. If no site string is seen the value in the dictionary
+    is None.
+
+    The version and date strings are required. If they are not found a BadReadme
+    exception is raised.
 
     Parameters
        - path (str) - the path to the file to be read
 
     Returns
-       Dictionary of 'version' (the version string), 'date' (the date string),
-             'extra' (a list of any extra lines found). The return value is None on error.
+       Dictionary of 'site' ( the site URL or None), 'version' (the version string), 
+             'date' (the date string), 'extra' (a list of any extra lines found). 
+             The return value is None on error except that format errors raise
+             a BadReadme exception.
+
+    Raises
+       - casaconfig.BadReadme - raised when there is a format error in the file at path
     """
 
     import os
+    from casaconfig import BadReadme
 
+    site = None
     version = ""
     date = ""
     extra = []
     result = None
-    
+
     try:
         with open(path, 'r') as fid:
             readmeLines = fid.readlines()
-            version = readmeLines[1].split(':')[1].strip()
-            date = readmeLines[2].split(':')[1].strip()
-            if len(readmeLines) > 3:
-                for extraLine in readmeLines[3:]:
-                    if (extraLine[0] != '#'):
-                        extra.append(extraLine.strip())
-            result = {'version':version, 'date':date, 'extra':extra}
-    except:
+            # order is unimportant except the first line must start with
+            # an "#" and the second line starting with "#" indicates the
+            # start of the "extra" lines
+            # duplicate instances of the same key in key : value lines are accepted
+            # the last value associated with key is used, that should never happen.
+            inExtraLines = False
+            if readmeLines[0][0] != '#':
+                raise BadReadme('Readme file missing required "#" at start of first line, %s' % path)
+            for line in readmeLines[1:]:
+                if inExtraLines and not (line[0] == '#'):
+                    extra.append(line.strip())
+                elif line[0] == '#':
+                    inExtraLines = True
+                else:
+                    splitLine = line.split(':')
+                    if len(splitLine) < 2:
+                        raise BadReadme('A line did not have an expected ":" separating into at least two parts, %s' % path)
+                    key = splitLine[0].strip()
+                    if key == 'site':
+                        # the URL likely also has a ":" so rejoin the second part and then strip that
+                        siteURL = ":".join(splitLine[1:])
+                        site = siteURL.strip()
+                    elif key == 'version':
+                        version = splitLine[1].strip()
+                    elif key == 'date':
+                        date = splitLine[1].strip()
+                    # anything else is OK and silently ignored
+        result = {'site':site, 'version':version, 'date':date, 'extra':extra}
+    except BadReadme as exc:
+        # reraise it
+        raise
+    except Exception as exc:
+        # silently return None, handled elsewhere
         result = None
 
+    # require that date and version are now set in result
+    if result is not None and ((len(result['version'])==0) or (len(result['date'])==0)):
+        raise BadReadme('Readme file missing required version or date fields, %s' % path)
+
     return result

casaconfig/private/set_casacore_path.py

@@ -32,12 +32,12 @@ def set_casacore_path(path=None):
        None
 
     """
-    import pkg_resources
+    import importlib.resources
     import os
     import re
     import sys
     
-    if path is None: path = pkg_resources.resource_filename('casaconfig', 'data/')
+    if path is None: path = str(importlib.resources.files('casaconfig').joinpath('data/'))
     path = os.path.abspath(os.path.expanduser(path))
 
     rctext = 'measures.directory: %s\n' % path

casaconfig/private/summary.py

@@ -80,6 +80,9 @@ def summary(configDict = None):
             msg += "; legacy data not maintained by casaconfig"
         elif measVers == "error":
             msg += "; unexpected readme.txt file, measures should be reinstalled"
+        measSite = dataInfo['measures']['site']
+        if measSite is not None and len(measSite) > 0:
+            msg = msg + " site : " + measSite
         print(msg)
     
     if (dataInfo['release'] is None):

casaconfig/private/update_all.py

@@ -87,7 +87,8 @@ def update_all(path=None, logger=None, force=False, verbose=None):
         msgs = []
         msgs.append("Warning: path must exist as a directory and it must be owned by the user, path = %s" % path)
         msgs.append("Warning: no updates are possible on this path by this user.")
-        print_log_messages(msgs, logger, False)
+        # always print and log this although it's only a warning
+        print_log_messages(msgs, logger, False, 2)
         return
 
     # if path is empty, first use pull_data
@@ -95,7 +96,7 @@ def update_all(path=None, logger=None, force=False, verbose=None):
         pull_data(path, logger, verbose=verbose)
         # double check that it's not empty
         if len(os.listdir(path))==0:
-            print_log_messages("pull_data failed, see the error messages for more details. update_all can not continue")
+            print_log_messages("pull_data failed, see the error messages for more details. update_all can not continue", logger, True)
             return
 
     # readme.txt must exist in path at this point, using get_data_info provides more possible feedback
@@ -105,15 +106,15 @@ def update_all(path=None, logger=None, force=False, verbose=None):
         print_log_messages('could not find any data information about %s, can not continue with update_all' % path, logger, True)
 
     if dataInfo['casarundata'] is None:
-        print_log_messages('readme.txt not found at path, update_all can not continue, path = %s' % path, logger)
+        print_log_messages('readme.txt not found at path, update_all can not continue, path = %s' % path, logger, True)
         return
 
     if dataInfo['casarundata'] == 'invalid':
-        print_log_messages('readme.txt is invalid at path, update_all can not continue, path = %s' % path, logger)
+        print_log_messages('readme.txt is invalid at path, update_all can not continue, path = %s' % path, logger, True)
         return
 
     if dataInfo['casarundata'] == 'unknown':
-        print_log_messages('contents at path appear to be casarundata but no readme.txt was found, casaconfig did not populate this data and update_all can not continue, path = %s', path, logger)
+        print_log_messages('contents at path appear to be casarundata but no readme.txt was found, casaconfig did not populate this data and update_all can not continue, path = %s', path, logger, True)
         return
 
     # the updates should work now

casaconfig-1.4.0.dist-info/METADATA

@@ -0,0 +1,92 @@
+Metadata-Version: 2.4
+Name: casaconfig
+Version: 1.4.0
+Summary: CASA Operational Configuration Package
+Author-email: National Radio Astronomy Observatory <casa-feedback@nrao.edu>
+License-Expression: Apache-2.0
+Project-URL: Homepage, https://casa.nrao.edu/
+Project-URL: Documentation, https://casadocs.readthedocs.io/
+Project-URL: Repository, https://github.com/casangi/casaconfig.git
+Requires-Python: >=3.10
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: certifi>=2023.5.7
+Dynamic: license-file
+
+# casaconfig
+Runtime data necessary for CASA operation.
+
+- [latest casaconfig API on casadocs](https://casadocs.readthedocs.io/en/latest/api/casaconfig.html)
+- [stable casaconfig API on casadocs](https://casadocs.readthedocs.io/en/stable/api/casaconfig.html)
+      
+
+## Release Instructions
+1. Create a release branch with a version name (ie v1.6.2)
+2. Ensure the version number in pyproject.toml on the branch is set correctly
+3. Create a tag of the release branch (ie v1.6.2-1)
+4. Github Action runs automatically to publish a pip package to pypi
+
+## Installation
+
+```
+$: pip install casaconfig
+```
+
+## Usage
+
+See the casaconfig API documentation on casadocs (links above).
+
+Also see the External Data section of casadocs for additional details
+
+- [latest External Data section on casadocs](https://casadocs.readthedocs.io/en/latest/notebooks/external-data.html)
+- [stable External Data section on casadocs](https://casadocs.readthedocs.io/en/stable/notebooks/external-data.html)
+
+## Developers Instructions
+1. every push to the casaconfig repository will push a new wheel to [test pypi](https://test.pypi.org/project/casaconfig/#history)
+2. the version in pyproject.toml must be updated before each push so that the wheel has a unique name (e.g. "1.2.3dev2", where "dev?" could be incremented during development; see the [specification](https://packaging.python.org/en/latest/specifications/version-specifiers/#version-specifiers) for more information about valid version signifiers)
+3. When testing with a casatools build, "pip install" the development casaconfig wheel before running any tests - it may be installed before casatools is installed or after since the casatools build does not depend on casasconfig (uninstall any already installed casaconfig if necessary).
+4. For release, follow the above instructions.
+
+Wheels can be built locally following the same process used by the CI actions. To install the build-system dependencies as defined in pyproject.toml and then generate a source distribution and wheel:
+```
+python3 -m pip install build setuptools --user
+python3 -m build
+```
+This will create:
+```
+casaconfig.egg-info
+├── PKG-INFO
+├── SOURCES.txt
+├── dependency_links.txt
+├── requires.txt
+└── top_level.txt
+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.4.0.dist-info/RECORD

@@ -0,0 +1,34 @@
+casaconfig/__init__.py,sha256=1PgCLSWtmkHm8kZ0O01RUaDdkPodfpl2VKX5h3rjotY,787
+casaconfig/__main__.py,sha256=rmkK1hRFQSwNoVDJ3AV8Ht_36VY4DAceglevbcBNHcA,7541
+casaconfig/config.py,sha256=LtDCEvRVo8PS-sNv2QHBF9N19_VoaQEj3LzjkiioWcQ,7711
+casaconfig/private/CasaconfigErrors.py,sha256=5jgBGiFSussmC7tUAA-w0awYx-7hC6Dhv_OXNihJkkY,1519
+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=Qa105jNlH_k28kob_qFW7dTm0KtDMuxwnziPlQxxLFk,2127
+casaconfig/private/config_defaults_static.py,sha256=MOm3xyqEXZZNisqcZY1b6QmBjJas1ol-ccMePT0v8MI,3459
+casaconfig/private/data_available.py,sha256=osjljEt4RMwFd62PsYNh8Nsiw0FjLIBWolUuqqPO-3g,3108
+casaconfig/private/data_update.py,sha256=7qQVrkmtsq9vGYtB-dL2egWx85E0zbt4aUW4wadGFOA,20575
+casaconfig/private/do_auto_updates.py,sha256=GaPx9_Dt1kAUlcsA-cACV2-OTl19EDIf1pHDkVLPIdY,3551
+casaconfig/private/do_pull_data.py,sha256=6CKFjX1qOdYFPexXXiLMal70gNoM36rcdZY-OfrfAuA,5705
+casaconfig/private/do_untar_url.py,sha256=EWpwNGPcm6-G1TIhBjdlhS0j2YrQR3BSS7pWZv5W66w,4359
+casaconfig/private/get_argparser.py,sha256=-pwPMplwBJssSiEOVte89MqBRuxbZ3jLNVluQrv_eGc,1670
+casaconfig/private/get_available_files.py,sha256=iV7XBrhrJGD2iOQIancvcJJDWypeHftV_ICuGsCf0MQ,3733
+casaconfig/private/get_config.py,sha256=R_6lZ3hp9NNbfBBhrOBBieXDFhR6Q3MdGHSgUwICbzk,1590
+casaconfig/private/get_data_info.py,sha256=hZ6yBcJm--lRBzE2jLwhjKF3497aHtWtGrta7rec7Cc,13543
+casaconfig/private/get_data_lock.py,sha256=JysF75EHwP2FErjffMkfeV-9wy5wJJ9irPDrMvVzSIo,3809
+casaconfig/private/have_network.py,sha256=zCIbABTG_9ew9Ac3eb8ggNaZ_H61m_G4LCXkFZe7q5M,1410
+casaconfig/private/io_redirect.py,sha256=9mwl2siS3fFYCEi_u9Mojg7cBtBgzW00mc8H7V1NSEs,2879
+casaconfig/private/measures_available.py,sha256=SiGLDhr_nKQaXWVrKhiRPGeUOOL1C5LT5T1VtnIJ3dQ,12331
+casaconfig/private/measures_update.py,sha256=jNTYsX5U6E-DD769oiImstB2dvJDy4E9GSertZrx4aU,25641
+casaconfig/private/print_log_messages.py,sha256=zF8qRReNBk2I0biyG5OnlZCbXYIXhNnNF-vA7gYoyr8,2202
+casaconfig/private/pull_data.py,sha256=7vIv0j1luhSdQ6jFF5USrGU2wQ4829iSqh2NDPO3NuQ,17594
+casaconfig/private/read_readme.py,sha256=4fF5yy3HynkrFwhF6JUcc0DFQ-DP-WZEddrPpog8znI,4354
+casaconfig/private/set_casacore_path.py,sha256=C6BON-qx1mjrFizUWHYDPzOXubRNEX-wjUJqOeu-ezw,2254
+casaconfig/private/summary.py,sha256=xHpS9g3ZNv4ASNc_W05chKbZhHE-caeVnWhV9zsfvrY,3597
+casaconfig/private/update_all.py,sha256=xCxNTHSPQHoqW1Cs237WNDhgUBrOvTXKpXAFbCbYK6E,5601
+casaconfig-1.4.0.dist-info/licenses/LICENSE,sha256=OMpzmn2zUn6I4jmVqs1Coa_0NJcoJC9eweZ2gx-u0oI,11358
+tests/test_casaconfig.py,sha256=Zitmb-bmAGQDYAilQvfODgZQViGpYRPNgtMnstCd-O4,53611
+casaconfig-1.4.0.dist-info/METADATA,sha256=KSPNYf4Wf2gK2mGds-hF8bVDTAZw14res3GGYg4xDuQ,4037
+casaconfig-1.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+casaconfig-1.4.0.dist-info/top_level.txt,sha256=Uay9WTPz644aHfLbmj47WXzue19HtKRueFFCXu1N1Co,17
+casaconfig-1.4.0.dist-info/RECORD,,

{casaconfig-1.2.0.dist-info → casaconfig-1.4.0.dist-info}/WHEEL

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

tests/test_casaconfig.py

@@ -1,11 +1,18 @@
 import unittest
-import os, shutil, stat, sys, subprocess, time
+import os, shutil, stat, sys, subprocess, time, re
+import copy
 from datetime import date, timedelta
 import site
 sitepackages = site.getsitepackages()[0]
 
 import casaconfig
 
+def setDefaultConfig():
+    '''sets config to the default values'''
+    from casaconfig import config
+    for k in config.__defaults:
+        config.__dict__[k] = copy.deepcopy(config._config_defaults.__dict__[k])
+
 class casaconfig_test(unittest.TestCase):
 
     def setUp(self):
@@ -15,6 +22,8 @@ class casaconfig_test(unittest.TestCase):
         self.test_configpath =  os.path.join(os.path.expanduser("~/.casa/"),"config.py")
         self.test_siteconfigpath = os.path.join(os.getcwd(),'testsiteconfig.py')
 
+        setDefaultConfig()
+
         # testmeasures is used for measures-only tests
         # testrundata is used for full data install tests (at least casarundata is installed, which includes measures)
         # emptymeasures is used to test failure modes
@@ -38,7 +47,7 @@ class casaconfig_test(unittest.TestCase):
 
         if os.path.isfile(os.path.expanduser("~/.casa/config.py.user")):
             os.replace(os.path.expanduser("~/.casa/config.py.user"), os.path.expanduser("~/.casa/config.py"))
-
+ 
     def rmTestDirs(self):
         if os.path.exists(self.testMeasPath):
             shutil.rmtree(self.testMeasPath)
@@ -85,12 +94,12 @@ class casaconfig_test(unittest.TestCase):
         self.assertTrue(dataInfo['version']==measVers,"unexpected version installed by populate_testmeasures at %s : %s != %s" % (self.testMeasPath, dataInfo['version'], measVers))
 
     def populate_testrundata(self):
-        # ensures that there's some casaconfig populated casarundata at self.testMeasPath
+        # ensures that there's some casaconfig populated casarundata at self.testRundataPath
         # if there's a known version there it leave it as is
         # if the data info is None then it populates it with the most recent casarundata
         # the data info version can not be illegal or unknown (something unexpected is already there)
         # this function works as a test, but it happens on demand in an attempt to limit the calls to pull_data
-        
+
         dataInfo = casaconfig.get_data_info(self.testRundataPath, type='casarundata')
         if dataInfo is not None:
             version = dataInfo['version']
@@ -230,7 +239,7 @@ class casaconfig_test(unittest.TestCase):
         # final check that the expected version is now installed
         installedVers = casaconfig.get_data_info(path=self.testRundataPath,type='measures')['version']
         self.assertTrue(installedVers == vers, "expected version was not installed : %s != %s" % (installedVers, vers))
-        
+         
     @unittest.skipIf(not os.path.exists(os.path.join(sitepackages,'casatools')), "casatools not found")
     def test_auto_update_measures(self):
         '''Test Automatic Measures Updates to measurespath'''
@@ -258,6 +267,7 @@ class casaconfig_test(unittest.TestCase):
         f.write('measurespath = "{}"\n'.format(self.testRundataPath))
         f.write('measures_auto_update = True\n')
         f.write('data_auto_update = False\n')
+        f.write('casaconfig_verbose = 2\n')
         f.close()
 
         # start a new casatools, which should update the measures to the most recent version
@@ -270,7 +280,7 @@ class casaconfig_test(unittest.TestCase):
         # output should contain the latest version string
         ref = self.get_meas_avail()[-1] in str(output)
         self.assertTrue(ref, "Update Failed")
-
+ 
     @unittest.skipIf(not os.path.exists(os.path.join(sitepackages,'casatools')), "casatools not found")
     def test_auto_install_data(self):
         '''Test auto install of all data to measurespath on casatools startup'''
@@ -625,6 +635,14 @@ class casaconfig_test(unittest.TestCase):
         # This should work on any non-open path that isn't a measurespath. I think the cwd will
         # work just fine for that purposes.
 
+        # it needs something there to trigger the NoReadme
+        junkFileCreated = False
+        junkFilePath = os.path.join(os.getcwd(),"_junk_")
+        if not os.path.exists(junkFilePath):
+            with open(junkFilePath,'x') as f:
+                pass
+            junkFileCreated = True
+
         # data_update NoReadme
         try:
             exceptionSeen = False
@@ -648,6 +666,10 @@ class casaconfig_test(unittest.TestCase):
             print("unexpected exception seen when testing for NoReadme in measures_update")
             print(str(exc))
         self.assertTrue(exceptionSeen, "NoReadme not seen from measures_update")
+        
+        # clean up, remove junk
+        if junkFileCreated:
+            os.remove(junkFilePath)
 
         # NotWritable  : path is not writable by the user
         # use the emptyPath
@@ -743,15 +765,13 @@ class casaconfig_test(unittest.TestCase):
         ref = True if "UnsetMeasurespath" in str(output) else False
         self.assertTrue(ref, "UnsetMeasurespath not seen in output for do_auto_updates and measurespath=None")
 
-
     def test_exceptions_with_data(self):
         '''test that exceptions that require data happen when expected'''
        
         # 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')
@@ -785,8 +805,6 @@ class casaconfig_test(unittest.TestCase):
         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
 
@@ -850,7 +868,6 @@ class casaconfig_test(unittest.TestCase):
             # this check happens before the age is determined, so no need to backdate the readme.txt file here
             casaconfig.measures_update(self.testRundataPath)
         except casaconfig.BadReadme as exc:
-            print(str(exc))
             exceptionSeen = True
         except Exception as exc:
             print("unexpected exception seen when testing for BadRadme in measures_update")
@@ -864,12 +881,10 @@ class casaconfig_test(unittest.TestCase):
 
         # get the current permissions of the testRundataPath
         orig_pstat = stat.S_IMODE(os.stat(self.testRundataPath).st_mode)
-        print('orig_pstat = %s' % orig_pstat)
         # a bitmask that's the opposite of all of the write permission bits
         no_write = ~stat.S_IWUSR & ~stat.S_IWGRP & ~stat.S_IWOTH
         # remove the write permissions
         pstat = orig_pstat & no_write
-        print('pstat = %s' % pstat)
         os.chmod(self.testRundataPath,pstat)
 
 
@@ -883,16 +898,174 @@ class casaconfig_test(unittest.TestCase):
         except Exception as exc:
             print("unexpected exception seen when testing for NotWritable in measures_update")
             print(str(exc))
-            import traceback
-            traceback.print_exc()
             
         # reset to original permissions before anything else is checked
         os.chmod(self.testRundataPath,orig_pstat)
         
         self.assertTrue(exceptionSeen, "NotWritable not seen from measures_update")
 
+    def siteAge(self, ma_site):
+        # given a list returned by measures_available return the age of the last file in the list
+        dateMatch = re.search(r".*_Measures_(\d{4})(\d{2})(\d{2})-.*", ma_site[-1])
+        fileDate = date(int(dateMatch.group(1)), int(dateMatch.group(2)), int(dateMatch.group(3)))
+        dateDiff = date.today() - fileDate
+        return dateDiff.days
+
+    def test_measures_site(self):
+        '''tests related to measures site'''
+
+        from casaconfig import config
+
+        # measures_available should work for the default list and each element individually
+        ma = casaconfig.measures_available()
+        self.assertTrue(ma[0] in config.measures_site, "measures_available first element is not an element of config.measures_site")
+
+        # this test code assumes there are 2 sites, if that ever is not the case someone will need
+        # to make this more general
+        site_0 = config.measures_site[0]
+        site_1 = config.measures_site[1]
+
+        site_0_ma = casaconfig.measures_available(measures_site=site_0)
+        self.assertTrue(site_0_ma[0]==site_0)
+        site_age_0 = self.siteAge(site_0_ma)
+
+        site_1_ma = casaconfig.measures_available(measures_site=site_1)
+        self.assertTrue(site_1_ma[0]==site_1)
+        site_age_1 = self.siteAge(site_1_ma)
+
+        # reversing the list should get the currently second site, unless that site is too old
+        if site_age_1 <= config.measures_site_interval:
+            # site is not too old
+            config.measures_site.reverse()
+            ma = casaconfig.measures_available()
+            self.assertTrue(ma[0]==site_1, "reversing measures_site did not return the second site list as expected")
+            config.measures_site.reverse()
+        else:
+            print("test_measures_site, skipping test of reversing measures_site as %s appears to be out of date" % site_1)
+
+        # everything is out of date, finds the youngest or first site if they are both the same age
+        youngestSite = site_0 if site_age_0 <= site_age_1 else site_1
+        config.measures_site_interval = -1
+        ma = casaconfig.measures_available()
+        self.assertTrue(ma[0]==youngestSite,"list from youngest site not return with measures_site_interval = -1")
+
+        # reverse the list, if they are the same age the first one (now site_1) will be used
+        # otherwise it will still return whatever the youngestSite was above
+        config.measures_site.reverse()
+        if site_age_0 == site_age_1:
+            ma = casaconfig.measures_available()
+            self.assertTrue(ma[0]==site_1, "reversing measures_site with measures_site_interval = -1 did not return list from second site, sites have same age")
+        else:
+            ma = casaconfig.measures_available()
+            self.assertTrue(ma[0]==youngestSite, "reversing measures_site with measures_site_interval = -1 did not return list from youngest site, sites have same age")
+
+        # return to default values
+        config.measures_site = copy.deepcopy(config._config_defaults.measures_site)
+        config.measures_site_interval = config._config_defaults.measures_site_interval
+
+        # the rest of the tests use the test_measures area
+        self.populate_testmeasures()
+
+        # install an older version from each site
+        # check that without specifying the site it finds the site
+        # check that with specifying the correct site it finds the site
+        # check that when given the wrong site it doesn't find it
+
+        site_0_version = site_0_ma[-3]
+        site_1_version = site_1_ma[-4]
+
+        di = casaconfig.get_data_info(path=self.testMeasPath, type='measures')
+        print('di : %s' % str(di))
         
-        
+        for site, vers, altSite in [(site_0, site_0_version, site_1), (site_1, site_1_version, site_0)]:
+             # let it find the site
+            casaconfig.measures_update(path=self.testMeasPath, version=vers, force=True)
+            di = casaconfig.get_data_info(path=self.testMeasPath, type='measures')
+            self.assertTrue(di['site']==site and di['version']==vers)
+
+            # give it the site
+            casaconfig.measures_update(path=self.testMeasPath,version=vers,measures_site=site, force=True)
+            di = casaconfig.get_data_info(path=self.testMeasPath, type='measures')
+            self.assertTrue(di['site']==site and di['version']==vers)
+
+            # this fails without throwing an exception, first, force an update to the most recent version at this site
+            casaconfig.measures_update(path=self.testMeasPath, measures_site=site, force=True)
+            di = casaconfig.get_data_info(path=self.testMeasPath, type='measures')
+            # it should not be the vers being checked here
+            self.assertTrue(di['version'] != vers, "unexpected version installed, this should not happen here")
+            installedVersion = di['version']
+            # trying to install this version from the wrong site will not change that version
+            casaconfig.measures_update(path=self.testMeasPath, version=vers, measures_site=altSite, force=True)
+            di = casaconfig.get_data_info(path=self.testMeasPath, type='measures')
+            self.assertTrue(di['version'] != vers and di['version']==installedVersion, "measures_update unexpectedly installed a version that should not exist at the requested site")
+
+        # use a site that exists but has no valid measures files - casarundata
+        # each of those should raise a RemoteError exception
+        exceptionCaught = False
+        casarundataURL = 'https://go.nrao.edu/casarundata'
+        try:
+            ma = casaconfig.measures_available(measures_site=[casarundataURL])
+        except casaconfig.RemoteError as exc:
+            exceptionCaught = True
+        self.assertTrue(exceptionCaught, "measures_available on an exisitng site in list with no measures tar files did not raised the expected exception")
+
+        exceptionCaught = False
+        try:
+            ma = casaconfig.measures_available(measures_site=casarundataURL)
+        except casaconfig.RemoteError as exc:
+            exceptionCaught = True
+        self.assertTrue(exceptionCaught, "measures_available on an exisitng site with no measures tar files did not raised the expected exception")
+
+        exceptionCaught = False
+        try:
+            ma = casaconfig.measures_update(path=self.testMeasPath, measures_site=casarundataURL, force=True)
+        except casaconfig.RemoteError as exc:
+            exceptionCaught = True
+        self.assertTrue(exceptionCaught, "measures_update on an exisitng site with no[ measures tar files did not raised the expected exception")
+            
+        # add this in at the head of a measures_site list that contains valid sites should silenently move on to a valid site
+        siteList = [casarundataURL] + config.measures_site
+        exceptionCaught = False
+        try:
+            ma = casaconfig.measures_available(measures_site=siteList)
+        except casaconfig.RemoteError as exc:
+            exceptionCaught = True
+        self.assertFalse(exceptionCaught, "measures_available on a list with one empty site at head and non-empty sites unexpectedly raised an exception")
+
+    def test_update_interval(self):
+        '''tests use of config update_interval values'''
+
+        from casaconfig import config
+        self.populate_testrundata()
+
+        # data
+        # populate with an older data
+        da = casaconfig.data_available()
+        casaconfig.data_update(self.testRundataPath,version=da[-2],force=True)
+        # default data_update_interval will not allow an update at this point
+        casaconfig.data_update(self.testRundataPath)
+        di = casaconfig.get_data_info(self.testRundataPath, type='casarundata')
+        self.assertTrue(di['version'] == da[-2],'data_update unexpectedly updated when data_update_interval should not have allowed it to update')
+        # this means data_update always checks and updates if necessary
+        config.data_update_interval = -1
+        casaconfig.data_update(self.testRundataPath)
+        di = casaconfig.get_data_info(self.testRundataPath, type='casarundata')
+        self.assertFalse(di['version'] == da[-2],'data_update did not update casarundata version as expected with negative data_update_interval')
+
+        # measures
+        # populate with an older data
+        ma = casaconfig.measures_available()
+        casaconfig.measures_update(self.testRundataPath,version=ma[-2],force=True)
+        # default measures_update_interval will not allow an update at this point
+        casaconfig.measures_update(self.testRundataPath)
+        di = casaconfig.get_data_info(self.testRundataPath,type='measures')
+        self.assertTrue(di['version'] == ma[-2],'measures_update unexpectedly updated when measures_update_interval should not have allowed it to update')
+        # this means measures_update always checks and updates if necessary
+        config.measures_update_interval = -1
+        casaconfig.measures_update(self.testRundataPath)
+        di = casaconfig.get_data_info(self.testRundataPath,type='measures')
+        self.assertFalse(di['version'] == ma[-2],'measures_update did not update measures version as expected with negative measures_update_interval')
+
 if __name__ == '__main__':
 
     unittest.main()