Merge pull request #1970 from common-workflow-language/dependabot/pip/black-approx-eq-24.1

mr-c · web-flow · commit d8f0eb23cbaf · 2024-01-29T16:11:14.000+01:00
Update black requirement from ~=23.12 to ~=24.1
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -6,3 +6,6 @@
 
 # upgrade to black 23.1, longer lines (100)
 7fe8c0739b0515d00daabc7db87bc5fad926d345
+
+# upgrade to black 24
+80c9ec01b4602fc51ac1f53744f98df8baba3c31
diff --git a/cwltool/builder.py b/cwltool/builder.py
@@ -1,4 +1,5 @@
 """Command line builder."""
+
 import copy
 import logging
 import math
diff --git a/cwltool/checker.py b/cwltool/checker.py
@@ -1,4 +1,5 @@
 """Static checking of CWL workflow connectivity."""
+
 from collections import namedtuple
 from typing import (
     Any,
diff --git a/cwltool/context.py b/cwltool/context.py
@@ -1,4 +1,5 @@
 """Shared context objects that replace use of kwargs."""
+
 import copy
 import os
 import shutil
diff --git a/cwltool/cwlviewer.py b/cwltool/cwlviewer.py
@@ -1,4 +1,5 @@
 """Visualize a CWL workflow."""
+
 from pathlib import Path
 from typing import Iterator, List, cast
 from urllib.parse import urlparse
diff --git a/cwltool/executors.py b/cwltool/executors.py
@@ -1,4 +1,5 @@
 """Single and multi-threaded executors."""
+
 import datetime
 import functools
 import logging
diff --git a/cwltool/loghandler.py b/cwltool/loghandler.py
@@ -1,4 +1,5 @@
 """Shared logger for cwltool."""
+
 import logging
 
 import coloredlogs
diff --git a/cwltool/mpi.py b/cwltool/mpi.py
@@ -1,4 +1,5 @@
 """Experimental support for MPI."""
+
 import inspect
 import os
 import re
diff --git a/cwltool/process.py b/cwltool/process.py
@@ -1,4 +1,5 @@
 """Classes and methods relevant for all CWL Process types."""
+
 import abc
 import copy
 import functools
diff --git a/cwltool/run_job.py b/cwltool/run_job.py
@@ -1,4 +1,5 @@
 """Only used when there is a job script or CWLTOOL_FORCE_SHELL_POPEN=1."""
+
 import json
 import os
 import subprocess  # nosec
diff --git a/cwltool/secrets.py b/cwltool/secrets.py
@@ -1,4 +1,5 @@
 """Minimal in memory storage of secrets."""
+
 import uuid
 from typing import Dict, List, MutableMapping, MutableSequence, Optional, cast
 
diff --git a/cwltool/utils.py b/cwltool/utils.py
@@ -1,4 +1,5 @@
 """Shared functions and other definitions."""
+
 import collections
 
 try:
diff --git a/lint-requirements.txt b/lint-requirements.txt
@@ -1,3 +1,3 @@
 flake8-bugbear<23.13
-black~=23.12
+black~=24.1
 codespell
diff --git a/mypy-stubs/prov/model.pyi b/mypy-stubs/prov/model.pyi
@@ -223,10 +223,9 @@ class ProvBundle:
     ) -> QualifiedName | None: ...
     def get_records(
         self,
-        class_or_type_or_tuple: type
-        | type[int | str]
-        | Tuple[type | type[int | str] | Tuple[Any, ...], ...]
-        | None = ...,
+        class_or_type_or_tuple: (
+            type | type[int | str] | Tuple[type | type[int | str] | Tuple[Any, ...], ...] | None
+        ) = ...,
     ) -> List[ProvRecord]: ...
     def get_record(self, identifier: Identifier | None) -> ProvRecord | List[ProvRecord] | None: ...
     def is_document(self) -> bool: ...
diff --git a/tests/cwl-conformance/cwltool-conftest.py b/tests/cwl-conformance/cwltool-conftest.py
@@ -3,6 +3,7 @@
 
 Calls cwltool via Python, instead of a subprocess via `--cwl-runner cwltool`.
 """
+
 import json
 from io import StringIO
 from typing import Any, Dict, List, Optional, Tuple
diff --git a/tests/test_check.py b/tests/test_check.py
@@ -1,4 +1,5 @@
 """Confirm some known-bad CWL descriptions."""
+
 import pytest
 
 from cwltool.main import main
diff --git a/tests/test_dependencies.py b/tests/test_dependencies.py
@@ -1,4 +1,5 @@
 """Tests of satisfying SoftwareRequirement via dependencies."""
+
 import os
 import tempfile
 from getpass import getuser
diff --git a/tests/test_docker.py b/tests/test_docker.py
@@ -1,4 +1,5 @@
 """Tests for docker engine."""
+
 import json
 import re
 from pathlib import Path
diff --git a/tests/test_environment.py b/tests/test_environment.py
@@ -1,4 +1,5 @@
 """Test passing of environment variables to tools."""
+
 import os
 from abc import ABC, abstractmethod
 from pathlib import Path
diff --git a/tests/test_iwdr.py b/tests/test_iwdr.py
@@ -1,4 +1,5 @@
 """InitialWorkDirRequirement related tests."""
+
 import json
 import re
 from pathlib import Path
diff --git a/tests/test_js_sandbox.py b/tests/test_js_sandbox.py
@@ -1,4 +1,5 @@
 """Test sandboxjs.py and related code."""
+
 import logging
 import os
 import shutil
diff --git a/tests/test_load_tool.py b/tests/test_load_tool.py
@@ -1,4 +1,5 @@
 """Tests for cwltool.load_tool."""
+
 import logging
 import urllib.parse
 from pathlib import Path
diff --git a/tests/test_loop.py b/tests/test_loop.py
@@ -1,4 +1,5 @@
 """Test the prototype loop extension."""
+
 import json
 from io import StringIO
 from typing import MutableMapping, MutableSequence
diff --git a/tests/test_mpi.py b/tests/test_mpi.py
@@ -1,4 +1,5 @@
 """Tests of the experimental MPI extension."""
+
 import json
 import os.path
 import sys
diff --git a/tests/test_recursive_validation.py b/tests/test_recursive_validation.py
@@ -1,4 +1,5 @@
 """Test the recursive validation feature (validate document and try to build tool)."""
+
 from cwltool.load_tool import fetch_document, recursive_resolve_and_validate_document
 
 from .util import get_data
diff --git a/tests/test_singularity.py b/tests/test_singularity.py
@@ -1,4 +1,5 @@
 """Tests to find local Singularity image."""
+
 import shutil
 from pathlib import Path
 from typing import Any
diff --git a/tests/test_singularity_versions.py b/tests/test_singularity_versions.py
@@ -1,4 +1,5 @@
 """Test singularity{,-ce} & apptainer versions."""
+
 from subprocess import check_output  # nosec
 
 import cwltool.singularity
diff --git a/tests/test_streaming.py b/tests/test_streaming.py
@@ -1,4 +1,5 @@
 """Test that files marked as 'streamable' when 'streaming_allowed' can be named pipes."""
+
 import os
 from pathlib import Path
 from typing import cast
diff --git a/tests/test_tmpdir.py b/tests/test_tmpdir.py
@@ -1,4 +1,5 @@
 """Test that all temporary directories respect the --tmpdir-prefix and --tmp-outdir-prefix options."""
+
 import os
 import re
 import shutil
diff --git a/tests/test_udocker.py b/tests/test_udocker.py
@@ -1,4 +1,5 @@
 """Test optional udocker feature."""
+
 import copy
 import os
 import subprocess
diff --git a/tests/test_validate.py b/tests/test_validate.py
@@ -1,4 +1,5 @@
 """Tests --validation."""
+
 import re
 
 from .util import get_data, get_main_output
diff --git a/tests/util.py b/tests/util.py
@@ -1,4 +1,5 @@
 """Test functions."""
+
 import atexit
 import contextlib
 import io

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`"""Command line builder."""`
	`2`	`+`
`2`	`3`	`import copy`
`3`	`4`	`import logging`
`4`	`5`	`import math`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`"""Static checking of CWL workflow connectivity."""`
	`2`	`+`
`2`	`3`	`from collections import namedtuple`
`3`	`4`	`from typing import (`
`4`	`5`	`Any,`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`"""Shared context objects that replace use of kwargs."""`
	`2`	`+`
`2`	`3`	`import copy`
`3`	`4`	`import os`
`4`	`5`	`import shutil`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`"""Visualize a CWL workflow."""`
	`2`	`+`
`2`	`3`	`from pathlib import Path`
`3`	`4`	`from typing import Iterator, List, cast`
`4`	`5`	`from urllib.parse import urlparse`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`"""Single and multi-threaded executors."""`
	`2`	`+`
`2`	`3`	`import datetime`
`3`	`4`	`import functools`
`4`	`5`	`import logging`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`"""Shared logger for cwltool."""`
	`2`	`+`
`2`	`3`	`import logging`
`3`	`4`
`4`	`5`	`import coloredlogs`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`"""Experimental support for MPI."""`
	`2`	`+`
`2`	`3`	`import inspect`
`3`	`4`	`import os`
`4`	`5`	`import re`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`"""Classes and methods relevant for all CWL Process types."""`
	`2`	`+`
`2`	`3`	`import abc`
`3`	`4`	`import copy`
`4`	`5`	`import functools`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`"""Only used when there is a job script or CWLTOOL_FORCE_SHELL_POPEN=1."""`
	`2`	`+`
`2`	`3`	`import json`
`3`	`4`	`import os`
`4`	`5`	`import subprocess # nosec`