further apply_macros changes

Author: james-bruten-mo

lfric_macros/apply_macros.py

@@ -564,16 +564,22 @@ def get_full_import_path(self, imp):
         """
 
         core_imp = os.path.join(self.core_source, imp)
-        if os.path.exists(core_imp):
+        if os.path.exists(core_imp) or os.path.exists(
+            os.path.dirname(core_imp)
+        ):
             return core_imp
 
         # Reinstate when using Jules Shared from Jules
         # jules_imp = os.path.join(self.jules_source, imp)
-        # if os.path.exists(jules_imp):
+        # if os.path.exists(jules_imp) or os.path.exists(
+        #     os.path.dirname(jules_imp)
+        # ):
         #     return jules_imp
 
         apps_imp = os.path.join(self.root_path, imp)
-        if os.path.exists(apps_imp):
+        if os.path.exists(apps_imp) or os.path.exists(
+            os.path.dirname(apps_imp)
+        ):
             return apps_imp
 
         raise Exception(
@@ -612,7 +618,7 @@ def read_meta_imports(self, meta_dir, flag="import"):
                         # Split the import line by '=' then take the rhs
                         # Then remove the trailing '/HEAD'
                         # Then prepend the path to the working copy
-                        imp = line.split("=", 1)[1].strip("/HEAD")
+                        imp = line.split("=", 1)[1].removesuffix("/HEAD")
                         imp = self.get_full_import_path(imp)
                         imports.append(imp)
                     else:
@@ -1038,7 +1044,12 @@ def apply_macros_main(args):
     """
 
     macro_object = ApplyMacros(
-        args.tag, args.cname, args.version, args.apps, args.core, args.jules
+        args["tag"],
+        args["cname"],
+        args["version"],
+        args["apps"],
+        args["core"],
+        args["jules"],
     )
 
     # Pre-process macros
@@ -1070,4 +1081,4 @@ def apply_macros_main(args):
 
 if __name__ == "__main__":
     args = parse_args()
-    apply_macros_main(args)
+    apply_macros_main(vars(args))