From 4e8edbf09aee39cbbe89160ee3145dfe336c4b17 Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" Date: Tue, 16 May 2023 11:29:56 +0200 Subject: [PATCH] remove some type ignores Now that cwl-upgrader & schema-salad have upgraded to newer ruamel.yaml --- cwl_utils/expression_refactor.py | 2 +- cwl_utils/graph_split.py | 6 +++--- tests/test_parser.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cwl_utils/expression_refactor.py b/cwl_utils/expression_refactor.py index 038b9539..6dd675d6 100755 --- a/cwl_utils/expression_refactor.py +++ b/cwl_utils/expression_refactor.py @@ -112,7 +112,7 @@ def refactor(args: argparse.Namespace) -> int: """Primary processing loop.""" return_code = 0 yaml = YAML(typ="rt") - yaml.preserve_quotes = True # type: ignore[assignment] + yaml.preserve_quotes = True for document in args.inputs: _logger.info("Processing %s.", document) with open(document) as doc_handle: diff --git a/cwl_utils/graph_split.py b/cwl_utils/graph_split.py index 861115e0..e37e7b04 100755 --- a/cwl_utils/graph_split.py +++ b/cwl_utils/graph_split.py @@ -89,7 +89,7 @@ def graph_split( ) -> None: """Loop over the provided packed CWL document and split it up.""" yaml = YAML(typ="rt") - yaml.preserve_quotes = True # type: ignore[assignment] + yaml.preserve_quotes = True source = yaml.load(sourceIO) add_lc_filename(source, sourceIO.name) @@ -255,8 +255,8 @@ def yaml_dump(entry: Any, output_file: str, pretty: bool) -> None: """Output object as YAML.""" yaml = YAML(typ="rt") yaml.default_flow_style = False - yaml.map_indent = 4 # type: ignore[assignment] - yaml.sequence_indent = 2 # type: ignore[assignment] + yaml.map_indent = 4 + yaml.sequence_indent = 2 with open(output_file, "w", encoding="utf-8") as result_handle: if pretty: result_handle.write(stringify_dict(entry)) diff --git a/tests/test_parser.py b/tests/test_parser.py index 603f2e63..306e3816 100644 --- a/tests/test_parser.py +++ b/tests/test_parser.py @@ -24,7 +24,7 @@ ) TEST_v1_2_CWL = get_data("testdata/workflow_input_format_expr_v1_2.cwl") yaml = YAML(typ="rt") -yaml.preserve_quotes = True # type: ignore[assignment] +yaml.preserve_quotes = True def test_cwl_version() -> None: