Skip to content

Commit

Permalink
Remove some 3.8-isms
Browse files Browse the repository at this point in the history
  • Loading branch information
adamnovak committed Nov 6, 2024
1 parent 18c2b31 commit 9db3484
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/toil/test/wdl/wdltoil_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import string
import subprocess
import unittest
from typing import Any, Optional, Union
from typing import Any
from unittest.mock import patch
from uuid import uuid4

Expand Down Expand Up @@ -472,7 +472,7 @@ def test_missing_output_directory(self):
)

@needs_singularity_or_docker
def test_miniwdl_self_test(self, extra_args: Optional[list[str]] = None) -> None:
def test_miniwdl_self_test(self, extra_args: list[str] | None = None) -> None:
"""Test if the MiniWDL self test runs and produces the expected output."""
wdl_file = os.path.abspath("src/toil/test/wdl/miniwdl_self_test/self_test.wdl")
json_file = os.path.abspath("src/toil/test/wdl/miniwdl_self_test/inputs.json")
Expand Down Expand Up @@ -545,7 +545,7 @@ def test_miniwdl_self_test_by_reference(self) -> None:

@pytest.mark.integrative
@needs_singularity_or_docker
def test_dockstore_trs(self, extra_args: Optional[List[str]] = None) -> None:
def test_dockstore_trs(self, extra_args: list[str] | None = None) -> None:
wdl_file = "#workflow/github.com/dockstore/bcc2020-training/HelloWorld:master"
# Needs an input but doesn't provide a good one.
json_input = json.dumps({"hello_world.hello.myName": "https://raw.githubusercontent.com/dockstore/bcc2020-training/refs/heads/master/wdl-training/exercise1/name.txt"})
Expand Down Expand Up @@ -786,7 +786,7 @@ def make_string_expr(self, to_parse: str) -> WDL.Expr.String:

pos = WDL.Error.SourcePosition("nowhere", "nowhere", 0, 0, 0, 0)

parts: list[Union[str, WDL.Expr.Placeholder]] = re.split("(~{[^}]*})", to_parse)
parts: list[str | WDL.Expr.Placeholder] = re.split("(~{[^}]*})", to_parse)
for i in range(1, len(parts), 2):
parts[i] = WDL.Expr.Placeholder(pos, {}, WDL.Expr.Null(pos))

Expand Down

0 comments on commit 9db3484

Please sign in to comment.