Skip to content

Bump mypy from 1.16.1 to 1.17.0 #2135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 15, 2025
Merged

Bump mypy from 1.16.1 to 1.17.0 #2135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50577b3
Bump mypy from 1.16.1 to 1.17.0
dependabot[bot] Jul 15, 2025
34915ea
workaround for a mypy 1.17 regression
mr-c Jul 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 23 additions & 20 deletions cwltool/command_line_tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from enum import Enum
from functools import cmp_to_key, partial
from re import Pattern
from typing import TYPE_CHECKING, Any, Optional, TextIO, Union, cast
from typing import TYPE_CHECKING, Any, Iterable, Optional, TextIO, Union, cast

from mypy_extensions import mypyc_attr
from ruamel.yaml.comments import CommentedMap, CommentedSeq
Expand Down Expand Up @@ -1322,26 +1322,29 @@ def collect_output(
key=cmp_to_key(locale.strcoll),
)
r.extend(
[
{
"location": g,
"path": fs_access.join(
builder.outdir,
urllib.parse.unquote(g[len(prefix[0]) + 1 :]),
),
"basename": decoded_basename,
"nameroot": os.path.splitext(decoded_basename)[0],
"nameext": os.path.splitext(decoded_basename)[1],
"class": "File" if fs_access.isfile(g) else "Directory",
}
for g, decoded_basename in zip(
sorted_glob_result,
map(
lambda x: os.path.basename(urllib.parse.unquote(x)),
cast(
Iterable[CWLOutputType],
[
{
"location": g,
"path": fs_access.join(
builder.outdir,
urllib.parse.unquote(g[len(prefix[0]) + 1 :]),
),
"basename": decoded_basename,
"nameroot": os.path.splitext(decoded_basename)[0],
"nameext": os.path.splitext(decoded_basename)[1],
"class": "File" if fs_access.isfile(g) else "Directory",
}
for g, decoded_basename in zip(
sorted_glob_result,
),
)
]
map(
lambda x: os.path.basename(urllib.parse.unquote(x)),
sorted_glob_result,
),
)
],
)
)
except OSError as e:
_logger.warning(str(e), exc_info=builder.debug)
Expand Down
2 changes: 1 addition & 1 deletion mypy-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mypy==1.16.1 # also update pyproject.toml
mypy==1.17.0 # also update pyproject.toml
ruamel.yaml>=0.16.0,<0.19
cwl-utils>=0.32
cwltest
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
requires = [
"setuptools>=45",
"setuptools_scm[toml]>=8.0.4,<9",
"mypy==1.16.1", # also update mypy-requirements.txt
"mypy==1.17.0", # also update mypy-requirements.txt
"types-requests",
"types-psutil",
"ruamel.yaml>=0.16.0,<0.19",
Expand Down