casaconfig 0.0.75__tar.gz → 0.0.77__tar.gz

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

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

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

@@ -104,12 +104,35 @@ for __v in __defaults:
     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))
+            # None values cause problems with expanduser, do these individually
+            # None values aren't useful in a list, don't carry them forward
+            __vlist = []
+            for __vval in globals()[__v]:
+                if __vval is not None:
+                    __vval = __os.path.abspath(__os.path.expanduser(__vval))
+                    __vlist.append(__vval)
+                else:
+                    # debugging for now
+                    print("None value seen in config parameter list %s, skipped" % __v)
+                    print("__loaded_config_files : ")
+                    for __f in __loaded_config_files:
+                        print("  %s" % __f)
+                        
             globals()[__v] = __vlist
         else:
-            globals()[__v] = __os.path.abspath(__os.path.expanduser(globals()[__v]))
-                                             
+            # watch for None values here (possibly also in the list, but just here for now)
+            if globals()[__v] is not None:
+                globals()[__v] = __os.path.abspath(__os.path.expanduser(globals()[__v]))
+            else:
+                # debugging for now
+                print("None value seen while expanding path-like fields for config parameter %s" % __v)
+                print("__loaded_config_files : ")
+                for __f in __loaded_config_files:
+                    print("   %s" % __f)
+                print("__config_files : ")
+                for __f in __config_files:
+                    print("  %s" % __f)
+                
 def load_success( ):
     return __loaded_config_files
 def load_failure( ):

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

@@ -173,7 +173,7 @@ def data_update(path=None, version=None, force=False, logger=None, auto_update_r
         requestedVersion = available_data[-1]
 
     expectedMeasuresVersion = None
-    if requestedVersion is 'release':
+    if requestedVersion == 'release':
         # use the release version from get_data_info
         releaseInfo = get_data_info()['release']
         if releaseInfo is None:

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

@@ -154,7 +154,7 @@ def pull_data(path=None, version=None, force=False, logger=None):
         version = available_data[-1]
 
     expectedMeasuresVersion = None
-    if version is 'release':
+    if version == 'release':
         # use the release version from get_data_info
         releaseInfo = get_data_info()['release']
         if releaseInfo is None:

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

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

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

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