Merge pull request galaxyproject#17302 from nsoranzo/17274_followup

Follow-up on galaxyproject#17274 and galaxyproject#17262

lib/galaxy/authnz/managers.py

@@ -108,7 +108,7 @@ def _parse_oidc_backends_config(self, config_file):
         self.oidc_backends_config = {}
         self.oidc_backends_implementation = {}
         try:
-            tree = parse_xml(config_file, OIDC_BACKEND_SCHEMA)
+            tree = parse_xml(config_file, schemafname=OIDC_BACKEND_SCHEMA)
             root = tree.getroot()
             if root.tag != "OIDC":
                 raise etree.ParseError(

lib/galaxy/config/sample/oidc_backends_config.xml.sample

@@ -150,7 +150,7 @@ Please mind `http` and `https`.
         <!-- <icon>https://path/to/icon</icon>  -->
         <!-- (Optional) Enable PKCE for this IDP -->
         <!-- <pkce_support>false</pkce_support> -->
-        <!-- (Optional) the audiences accepted on teh access-token for this IDP.
+        <!-- (Optional) the audiences accepted on the access-token for this IDP.
         <!-- <accepted_audiences>galaxy</accepted_audiences> -->
 
     </provider>

lib/galaxy/util/__init__.py

@@ -295,7 +295,7 @@ def unique_id(KEY_SIZE=128):
 
 
 def parse_xml(
-    fname: StrPath, schemafname: Union[StrPath, None] = None, strip_whitespace=True, remove_comments=True
+    fname: StrPath, strip_whitespace=True, remove_comments=True, schemafname: Union[StrPath, None] = None
 ) -> ElementTree:
     """Returns a parsed xml tree"""
     parser = None
@@ -329,8 +329,8 @@ def parse_xml(
     except etree.ParseError:
         log.exception("Error parsing file %s", fname)
         raise
-    except etree.DocumentInvalid as e:
-        log.exception(f"Validation of file %s failed with error {e}" % fname)
+    except etree.DocumentInvalid:
+        log.exception("Validation of file %s failed", fname)
         raise
     return tree
 

pyproject.toml

@@ -165,7 +165,7 @@ watchdog = "*"
 
 [tool.poetry.group.typecheck.dependencies]
 mypy = "*"
-pydantic = "<2"  # for pydantic.mypy plugin
+pydantic = ">=2"  # for pydantic.mypy plugin
 types-bleach = "*"
 types-boto = "*"
 types-contextvars = "*"