Merge remote-tracking branch 'origin/main' into runtime-task-metadata

Author: mlin

Makefile

@@ -43,9 +43,9 @@ ci_housekeeping: check_check check doc
 ci_unit_tests: unit_tests
 
 check:
-	ruff check --ignore E741 WDL
+	ruff check WDL
 	mypy WDL
-	ruff format --check --line-length 100 WDL
+	ruff format --check WDL
 
 check_check:
 	# regression test against pyre/mypy doing nothing (issue #100)
@@ -54,7 +54,7 @@ check_check:
 	rm WDL/DELETEME_check_check.py
 
 pretty:
-	ruff format --line-length 100 WDL
+	ruff format WDL
 
 # build docker image with current source tree, poised to run tests e.g.:
 #   docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v /tmp:/tmp miniwdl

WDL/Lint.py

@@ -209,10 +209,11 @@ def _compound_coercion(
         if predicates:
             return predicates(to_type, from_type)
         if not from_type_predicate:
-
-            def from_type_predicate(ty):
-                return not isinstance(ty, (base_to_type, Type.Any))
-
+            from_type_predicate = lambda ty: (
+                not isinstance(  # noqa: E731
+                    ty, (base_to_type, Type.Any)
+                )
+            )
         return from_type_predicate(from_type)
     return False
 

pyproject.toml

@@ -72,4 +72,8 @@ write_to = "WDL/_version.py"
 mypy_path = "${MYPY_CONFIG_FILE_DIR}/stubs"
 
 [tool.ruff]
+line-length = 100
 exclude = ["WDL/_version.py"]
+
+[tool.ruff.lint]
+ignore = ["E741", "E731"]