From 64d4b4f16f609f7ad04286fa2aeac1147988939f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Jan 2026 03:49:59 +0000 Subject: [PATCH 1/3] Update black requirement from ==25.* to ==26.* Updates the requirements on [black](https://github.com/psf/black) to permit the latest version. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/25.1.0...26.1.0) --- updated-dependencies: - dependency-name: black dependency-version: 26.1.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- lint-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lint-requirements.txt b/lint-requirements.txt index 1800b69b..7607a498 100644 --- a/lint-requirements.txt +++ b/lint-requirements.txt @@ -1,4 +1,4 @@ flake8-bugbear < 25.12 -black == 25.* +black == 26.* codespell isort >= 5 From 1bb5e300cd86535004f14e0e40d7bc6ad17d3e87 Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" Date: Mon, 30 Mar 2026 17:24:50 +0200 Subject: [PATCH 2/3] black 2026 reformat --- cwl_utils/__meta__.py | 1 + cwl_utils/cwl_v1_0_expression_refactor.py | 1 + cwl_utils/cwl_v1_1_expression_refactor.py | 1 + cwl_utils/cwl_v1_2_expression_refactor.py | 1 + cwl_utils/expression.py | 1 + cwl_utils/expression_refactor.py | 1 + cwl_utils/file_formats.py | 1 - cwl_utils/image_puller.py | 1 + cwl_utils/inputs_schema_gen.py | 1 + cwl_utils/loghandler.py | 1 + cwl_utils/normalizer.py | 1 + cwl_utils/parser/cwl_v1_0_utils.py | 2 +- cwl_utils/parser/cwl_v1_1_utils.py | 2 +- cwl_utils/parser/cwl_v1_2_utils.py | 2 +- cwl_utils/parser/utils.py | 1 + cwl_utils/schemadef.py | 1 - cwl_utils/tests/test_cite_extract.py | 1 + cwl_utils/tests/test_docker_extract.py | 6 ++---- cwl_utils/tests/test_etools_to_clt.py | 1 + cwl_utils/tests/test_examples.py | 1 + cwl_utils/tests/test_graph_split.py | 1 + cwl_utils/tests/test_inputs_schema_gen.py | 1 + cwl_utils/tests/test_parser_utils.py | 3 ++- cwl_utils/tests/test_subscope.py | 1 - cwl_utils/types.py | 1 + cwl_utils/utils.py | 1 + 26 files changed, 25 insertions(+), 11 deletions(-) diff --git a/cwl_utils/__meta__.py b/cwl_utils/__meta__.py index 5c640b49..6f5c4fd6 100644 --- a/cwl_utils/__meta__.py +++ b/cwl_utils/__meta__.py @@ -1,3 +1,4 @@ # SPDX-License-Identifier: Apache-2.0 """Global version number for the cwl_utils package.""" + __version__ = "0.41" diff --git a/cwl_utils/cwl_v1_0_expression_refactor.py b/cwl_utils/cwl_v1_0_expression_refactor.py index c66e7d6f..1446319a 100755 --- a/cwl_utils/cwl_v1_0_expression_refactor.py +++ b/cwl_utils/cwl_v1_0_expression_refactor.py @@ -2,6 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # Copyright 2018-2021 Michael R. Crusoe """CWL Expression refactoring tool for CWL v1.0 .""" + import copy import hashlib import uuid diff --git a/cwl_utils/cwl_v1_1_expression_refactor.py b/cwl_utils/cwl_v1_1_expression_refactor.py index 3f260e56..1bedf4c2 100755 --- a/cwl_utils/cwl_v1_1_expression_refactor.py +++ b/cwl_utils/cwl_v1_1_expression_refactor.py @@ -2,6 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # Copyright 2018-2021 Michael R. Crusoe """CWL Expression refactoring tool for CWL v1.1 .""" + import copy import hashlib import uuid diff --git a/cwl_utils/cwl_v1_2_expression_refactor.py b/cwl_utils/cwl_v1_2_expression_refactor.py index 3d7f86e7..1fd73d74 100755 --- a/cwl_utils/cwl_v1_2_expression_refactor.py +++ b/cwl_utils/cwl_v1_2_expression_refactor.py @@ -2,6 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # Copyright 2018-2021 Michael R. Crusoe """CWL Expression refactoring tool for CWL v1.2 .""" + import copy import hashlib import uuid diff --git a/cwl_utils/expression.py b/cwl_utils/expression.py index c5a3c39c..0b74a44d 100644 --- a/cwl_utils/expression.py +++ b/cwl_utils/expression.py @@ -1,5 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 """CWL Expression parsing.""" + import asyncio import inspect import json diff --git a/cwl_utils/expression_refactor.py b/cwl_utils/expression_refactor.py index 6439be9f..094f5810 100755 --- a/cwl_utils/expression_refactor.py +++ b/cwl_utils/expression_refactor.py @@ -2,6 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # Copyright 2018-2021 Michael R. Crusoe """CWL Expression refactoring tool for CWL.""" + import argparse import logging import shutil diff --git a/cwl_utils/file_formats.py b/cwl_utils/file_formats.py index 1cec4ba6..8c1b51f0 100644 --- a/cwl_utils/file_formats.py +++ b/cwl_utils/file_formats.py @@ -5,7 +5,6 @@ For more information, please visit https://www.commonwl.org/user_guide/16-file-formats/ """ - from rdflib import OWL, RDFS, Graph, URIRef from schema_salad.exceptions import ValidationException from schema_salad.utils import aslist, json_dumps diff --git a/cwl_utils/image_puller.py b/cwl_utils/image_puller.py index cb7be35b..5604002d 100644 --- a/cwl_utils/image_puller.py +++ b/cwl_utils/image_puller.py @@ -1,5 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 """Classes for docker-extract.""" + import logging import subprocess # nosec from abc import ABC, abstractmethod diff --git a/cwl_utils/inputs_schema_gen.py b/cwl_utils/inputs_schema_gen.py index d78228f8..3f7304d5 100644 --- a/cwl_utils/inputs_schema_gen.py +++ b/cwl_utils/inputs_schema_gen.py @@ -4,6 +4,7 @@ # Copyright 2024 Alexis Lucattini """Generate JSON Schema from CWL inputs object.""" + import argparse import json import logging diff --git a/cwl_utils/loghandler.py b/cwl_utils/loghandler.py index d7f5c221..9e590c6d 100644 --- a/cwl_utils/loghandler.py +++ b/cwl_utils/loghandler.py @@ -1,5 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 """Shared logging object.""" + import logging _logger = logging.getLogger("cwl_utils") # pylint: disable=invalid-name diff --git a/cwl_utils/normalizer.py b/cwl_utils/normalizer.py index c0613e45..9e5107b3 100644 --- a/cwl_utils/normalizer.py +++ b/cwl_utils/normalizer.py @@ -2,6 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # Copyright 2021 Michael R. Crusoe """Normalize CWL documents to CWL v1.2, JSON style.""" + import argparse import logging import sys diff --git a/cwl_utils/parser/cwl_v1_0_utils.py b/cwl_utils/parser/cwl_v1_0_utils.py index 2400298b..af1df11b 100644 --- a/cwl_utils/parser/cwl_v1_0_utils.py +++ b/cwl_utils/parser/cwl_v1_0_utils.py @@ -5,7 +5,7 @@ from collections.abc import MutableMapping, MutableSequence from io import StringIO from pathlib import Path -from typing import Any, IO, cast +from typing import IO, Any, cast from urllib.parse import urldefrag from schema_salad.exceptions import ValidationException diff --git a/cwl_utils/parser/cwl_v1_1_utils.py b/cwl_utils/parser/cwl_v1_1_utils.py index 79ce337b..62265819 100644 --- a/cwl_utils/parser/cwl_v1_1_utils.py +++ b/cwl_utils/parser/cwl_v1_1_utils.py @@ -5,7 +5,7 @@ from collections.abc import MutableMapping, MutableSequence from io import StringIO from pathlib import Path -from typing import Any, IO, cast +from typing import IO, Any, cast from urllib.parse import urldefrag from schema_salad.exceptions import ValidationException diff --git a/cwl_utils/parser/cwl_v1_2_utils.py b/cwl_utils/parser/cwl_v1_2_utils.py index 2eb45685..f770da8f 100644 --- a/cwl_utils/parser/cwl_v1_2_utils.py +++ b/cwl_utils/parser/cwl_v1_2_utils.py @@ -5,7 +5,7 @@ from collections.abc import MutableMapping, MutableSequence from io import StringIO from pathlib import Path -from typing import Any, IO, cast +from typing import IO, Any, cast from urllib.parse import urldefrag from schema_salad.exceptions import ValidationException diff --git a/cwl_utils/parser/utils.py b/cwl_utils/parser/utils.py index 6849afd9..967beb12 100644 --- a/cwl_utils/parser/utils.py +++ b/cwl_utils/parser/utils.py @@ -14,6 +14,7 @@ import cwl_utils import cwl_utils.parser + from . import ( LoadingOptions, Process, diff --git a/cwl_utils/schemadef.py b/cwl_utils/schemadef.py index 14b0e25a..9c72dd6e 100644 --- a/cwl_utils/schemadef.py +++ b/cwl_utils/schemadef.py @@ -15,7 +15,6 @@ From https://github.com/rabix/sbpack/blob/b8404a0859ffcbe1edae6d8f934e51847b003320/sbpack/lib.py """ - import sys import urllib.parse from copy import deepcopy diff --git a/cwl_utils/tests/test_cite_extract.py b/cwl_utils/tests/test_cite_extract.py index a0933aef..1a061166 100644 --- a/cwl_utils/tests/test_cite_extract.py +++ b/cwl_utils/tests/test_cite_extract.py @@ -1,5 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 """Tests for cwl-cite-extract.""" + import pytest from cwl_utils.cite_extract import arg_parser, run diff --git a/cwl_utils/tests/test_docker_extract.py b/cwl_utils/tests/test_docker_extract.py index 8da8b11e..b675c84a 100644 --- a/cwl_utils/tests/test_docker_extract.py +++ b/cwl_utils/tests/test_docker_extract.py @@ -1,5 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 """Tests for cwl-docker-extract.""" + from pathlib import Path import pytest @@ -92,13 +93,10 @@ def test_container_extraction_no_dockerPull( assert len(reqs) == 1 assert len(list(tmp_path.iterdir())) == 0 captured = capsys.readouterr() - assert ( - captured.err - == """Unable to save image from due to lack of 'dockerPull': + assert captured.err == """Unable to save image from due to lack of 'dockerPull': class: DockerRequirement dockerImageId: 'debian:stable-slim.img' """ - ) @pytest.mark.parametrize( diff --git a/cwl_utils/tests/test_etools_to_clt.py b/cwl_utils/tests/test_etools_to_clt.py index 749cd372..10a9e774 100644 --- a/cwl_utils/tests/test_etools_to_clt.py +++ b/cwl_utils/tests/test_etools_to_clt.py @@ -1,5 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 """Test the CWL Expression refactoring tool.""" + import shutil import sys import tarfile diff --git a/cwl_utils/tests/test_examples.py b/cwl_utils/tests/test_examples.py index 3c812743..b7be8cb7 100644 --- a/cwl_utils/tests/test_examples.py +++ b/cwl_utils/tests/test_examples.py @@ -1,5 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 """Tests of example Python scripts.""" + import os import runpy from importlib.resources import as_file, files diff --git a/cwl_utils/tests/test_graph_split.py b/cwl_utils/tests/test_graph_split.py index bcf96070..732440f2 100644 --- a/cwl_utils/tests/test_graph_split.py +++ b/cwl_utils/tests/test_graph_split.py @@ -1,5 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 """Test the CWL $graph document splitter tool.""" + import json from io import StringIO from pathlib import Path diff --git a/cwl_utils/tests/test_inputs_schema_gen.py b/cwl_utils/tests/test_inputs_schema_gen.py index 09f0d2c8..23bc58ea 100644 --- a/cwl_utils/tests/test_inputs_schema_gen.py +++ b/cwl_utils/tests/test_inputs_schema_gen.py @@ -1,5 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 """Tests for cwl-inputs-schema-gen.""" + from pathlib import Path import pytest diff --git a/cwl_utils/tests/test_parser_utils.py b/cwl_utils/tests/test_parser_utils.py index 8594b7e0..d977ec75 100644 --- a/cwl_utils/tests/test_parser_utils.py +++ b/cwl_utils/tests/test_parser_utils.py @@ -1,5 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 """Test the CWL parsers utility functions.""" + import logging import re import tempfile @@ -7,7 +8,7 @@ from typing import cast import pytest -from pytest import raises, LogCaptureFixture +from pytest import LogCaptureFixture, raises from schema_salad.exceptions import ValidationException import cwl_utils.parser.cwl_v1_0 diff --git a/cwl_utils/tests/test_subscope.py b/cwl_utils/tests/test_subscope.py index 2f7d4d50..d50bf958 100644 --- a/cwl_utils/tests/test_subscope.py +++ b/cwl_utils/tests/test_subscope.py @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 """Test that scoping of identifiers in Workflow.steps[].run is correct.""" - from cwl_utils.parser import Workflow, load_document_by_uri from .util import get_path diff --git a/cwl_utils/types.py b/cwl_utils/types.py index e2cc2cf5..6b7b0d83 100644 --- a/cwl_utils/types.py +++ b/cwl_utils/types.py @@ -1,6 +1,7 @@ # SPDX-License-Identifier: Apache-2.0 # From https://github.com/rabix/sbpack/blob/b8404a0859ffcbe1edae6d8f934e51847b003320/sbpack/lib.py """Shared Python type definitions for commons JSON like CWL objects.""" + import sys from collections.abc import Mapping, MutableMapping, MutableSequence from typing import Any, Literal, TypeAlias, TypedDict, TypeGuard diff --git a/cwl_utils/utils.py b/cwl_utils/utils.py index a535fcfb..0db35819 100644 --- a/cwl_utils/utils.py +++ b/cwl_utils/utils.py @@ -1,5 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 """Miscellaneous utility functions.""" + import pathlib import subprocess # nosec import sys From f96a7b883d9cae6eb17e80b5cd021d4ebd92f7e8 Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" Date: Mon, 30 Mar 2026 17:25:15 +0200 Subject: [PATCH 3/3] ignore the black 2026 reformat in git blame --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 6730a1e9..48a331c4 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -6,3 +6,6 @@ af096c2301d5ae81daa41bf0b96417cebda76d05 # black 2025 + isort 512ad4373d78412a12a8301f5efeef8a31e669e7 + +# black 2026 + isort +1bb5e300cd86535004f14e0e40d7bc6ad17d3e87