Merge pull request #351 from tmolteno/fix_regexp

Fix regexp for later versions of python

scabha/configuratt/resolvers.py

@@ -229,7 +229,7 @@ def load_include_files(keyword):
                             warn = optional = False
 
                         # check for (location)filename.yaml or (location)/filename.yaml style
-                        match = re.match("^\\((.+)\\)/?(.+)$", incl)
+                        match = re.match(r"^\((.+)\)/?(.+)$", incl)
                         if match:
                             modulename, filename = match.groups()
                             if modulename.startswith("."):

scabha/schema_utils.py

@@ -221,8 +221,8 @@ def clickify_parameters(schemas: Union[str, Dict[str, Any]],
             elif dtype in ("MS", "File", "Directory"):
                 dtype = click.Path(exists=(io is schemas.inputs))
             else:
-                list_match = re.fullmatch("List\[(.*)\]", dtype)
-                tuple_match = re.fullmatch("Tuple\[(.*)\]", dtype)
+                list_match = re.fullmatch(r"List\[(.*)\]", dtype)
+                tuple_match = re.fullmatch(r"Tuple\[(.*)\]", dtype)
                 # List[x] type? Add validation callback to convert elements
                 if list_match:
                     elem_type = _atomic_types.get(list_match.group(1).strip(), str)

stimela/backends/kube/kube_utils.py

@@ -39,7 +39,7 @@
 }
 
 def resolve_unit(quantity:str, units: Dict = k8s_memory_units_in_bytes):
-    match = re.fullmatch("^(\d+)(.*)$", quantity)
+    match = re.fullmatch(r"^(\d+)(.*)$", quantity)
     if not match or match.group(2) not in units:
         raise ApiException(f"invalid quantity '{quantity}'")
     return int(match.group(1))*units[match.group(2)]

stimela/commands/run.py

@@ -45,7 +45,7 @@ def resolve_recipe_file(filename: str):
         return None
 
     # check for (location)filename.yml or (location)/filename.yml style
-    match1 = re.fullmatch("^\\((.+)\\)/?(.+)$", filename)
+    match1 = re.fullmatch(r"^\((.+)\)/?(.+)$", filename)
     match2 = re.fullmatch(r"^([\w.]+)::(.+)$", filename)
     if match1 or match2:
         modulename, fname = (match1 or match2).groups()
@@ -83,7 +83,7 @@ def load_recipe_files(filenames: List[str]):
     full_deps = configuratt.ConfigDependencies()
     for filename in filenames:
         # check for (location)filename.yaml or (location)/filename.yaml style
-        match1 = re.fullmatch("^\\((.+)\\)/?(.+)$", filename)
+        match1 = re.fullmatch(r"^\((.+)\)/?(.+)$", filename)
         match2 = re.fullmatch(r"^([\w.]+)::(.+)$", filename)
         if match1 or match2:
             modulename, filename = (match1 or match2).groups()

stimela/kitchen/cab.py

@@ -142,7 +142,7 @@ def __post_init__ (self):
             self.name = self.command or self.image
 
         # split off first word of name to avoid non-alphanumeric characters
-        match = re.match("(\w+)", self.name)
+        match = re.match(r"(\w+)", self.name)
         if match:
             self.name = match.group(1) or self.flavour.kind
         else:

stimela/stimela.conf

@@ -5,16 +5,16 @@ images:
     default-python: 
         registry: quay.io/stimela2
         name: python-astro
-        version: cc0.1.2
+        version: cc0.1.3
     default-casa: 
         registry: quay.io/stimela2
         name: casa
-        version: cc0.1.2
+        version: cc0.1.3
 
 opts:
     runtime:
         casa:
             path: casa
             opts: [--log2term, --nologger, --nologfile]
             wrapper: xvfb-run -a
-
+