made mypy ignores more specific

Author: tclose

extras/fileformats/extras/application/archive.py

@@ -52,13 +52,13 @@
 # ]
 
 
-@converter(source_format=FsObject, target_format=Tar)  # type: ignore[misc]
-@converter(source_format=FsObject, target_format=TarGzip, compression="gz")  # type: ignore[misc]
-@converter(source_format=Compressed, target_format=Tar[Compressed])  # type: ignore[misc]
+@converter(source_format=FsObject, target_format=Tar)  # type: ignore[untyped-decorator]
+@converter(source_format=FsObject, target_format=TarGzip, compression="gz")  # type: ignore[untyped-decorator]
+@converter(source_format=Compressed, target_format=Tar[Compressed])  # type: ignore[untyped-decorator]
 @converter(
     source_format=Compressed, target_format=TarGzip[Compressed], compression="gz"  # type: ignore[misc]
 )
-@python.define(outputs={"out_file": Path})  # type: ignore[misc]
+@python.define(outputs={"out_file": Path})  # type: ignore[untyped-decorator]
 def create_tar(
     in_file: FsObject,
     out_file: ty.Optional[Path] = None,
@@ -103,11 +103,11 @@ def create_tar(
     return Path(out_file)
 
 
-@converter(source_format=Tar, target_format=FsObject)  # type: ignore[misc]
-@converter(source_format=TarGzip, target_format=FsObject)  # type: ignore[misc]
-@converter(source_format=Tar[Compressed], target_format=Compressed)  # type: ignore[misc]
-@converter(source_format=TarGzip[Compressed], target_format=Compressed)  # type: ignore[misc]
-@python.define(outputs={"out_file": Path})  # type: ignore[misc]
+@converter(source_format=Tar, target_format=FsObject)  # type: ignore[untyped-decorator]
+@converter(source_format=TarGzip, target_format=FsObject)  # type: ignore[untyped-decorator]
+@converter(source_format=Tar[Compressed], target_format=Compressed)  # type: ignore[untyped-decorator]
+@converter(source_format=TarGzip[Compressed], target_format=Compressed)  # type: ignore[untyped-decorator]
+@python.define(outputs={"out_file": Path})  # type: ignore[untyped-decorator]
 def extract_tar(
     in_file: FsObject,
     extract_dir: ty.Optional[Path] = None,
@@ -136,9 +136,9 @@ def extract_tar(
     return extracted[0]
 
 
-@converter(source_format=FsObject, target_format=Zip)  # type: ignore[misc]
-@converter(source_format=Compressed, target_format=Zip[Compressed])  # type: ignore[misc]
-@python.define(outputs={"out_file": Zip})  # type: ignore[misc]
+@converter(source_format=FsObject, target_format=Zip)  # type: ignore[untyped-decorator]
+@converter(source_format=Compressed, target_format=Zip[Compressed])  # type: ignore[untyped-decorator]
+@python.define(outputs={"out_file": Zip})  # type: ignore[untyped-decorator]
 def create_zip(
     in_file: FsObject,
     out_file: ty.Optional[Path] = None,
@@ -183,9 +183,9 @@ def create_zip(
     return Zip(out_file)
 
 
-@converter(source_format=Zip, target_format=FsObject)  # type: ignore[misc]
-@converter(source_format=Zip[Compressed], target_format=Compressed)  # type: ignore[misc]
-@python.define(outputs={"out_file": Path})  # type: ignore[misc]
+@converter(source_format=Zip, target_format=FsObject)  # type: ignore[untyped-decorator]
+@converter(source_format=Zip[Compressed], target_format=Compressed)  # type: ignore[untyped-decorator]
+@python.define(outputs={"out_file": Path})  # type: ignore[untyped-decorator]
 def extract_zip(in_file: Zip, extract_dir: ty.Optional[Path] = None) -> Path:
 
     if extract_dir is None:

extras/fileformats/extras/application/serialization.py

@@ -1,16 +1,18 @@
-from pathlib import Path
-import typing as ty
 import tempfile
+import typing as ty
+from pathlib import Path
+
 import yaml
 from pydra.compose import python
-from fileformats.core import FileSet, converter, extra_implementation
-from fileformats.application import TextSerialization, Json, Yaml
+
+from fileformats.application import Json, TextSerialization, Yaml
 from fileformats.application.serialization import SerializationType
+from fileformats.core import FileSet, converter, extra_implementation
 
 
-@converter(target_format=Json, output_format=Json)  # type: ignore[misc]
-@converter(target_format=Yaml, output_format=Yaml)  # type: ignore[misc]
-@python.define(outputs={"out_file": TextSerialization})  # type: ignore[misc]
+@converter(target_format=Json, output_format=Json)  # type: ignore[untyped-decorator]
+@converter(target_format=Yaml, output_format=Yaml)  # type: ignore[untyped-decorator]
+@python.define(outputs={"out_file": TextSerialization})  # type: ignore[untyped-decorator]
 def convert_data_serialization(
     in_file: TextSerialization,
     output_format: ty.Type[TextSerialization],

extras/fileformats/extras/core/tests/test_converter.py

@@ -20,13 +20,13 @@
 
 
 @converter
-@python.define(outputs={"out_file": Bar})  # type: ignore[misc]
+@python.define(outputs={"out_file": Bar})  # type: ignore[untyped-decorator]
 def FooBarConverter(in_file: Foo):
     return Bar(write_test_file(Path.cwd() / "bar.bar", in_file.raw_contents))
 
 
 @converter(out_file="out")
-@python.define(outputs={"out": Bar})  # type: ignore[misc]
+@python.define(outputs={"out": Bar})  # type: ignore[untyped-decorator]
 def BazBarConverter(in_file: Baz):
     assert in_file
     return Bar(write_test_file(Path.cwd() / "bar.bar", in_file.raw_contents))

extras/fileformats/extras/generic/converters.py

@@ -1,22 +1,24 @@
 import tempfile
-from pathlib import Path
 import typing as ty
+from pathlib import Path
+
 from pydra.compose import python
-from fileformats.core import converter, FileSet
+
+from fileformats.core import FileSet, converter
 from fileformats.generic import DirectoryOf, SetOf, TypedDirectory, TypedSet
 
 T = FileSet.type_var("T")
 
 
-@converter(target_format=SetOf[T], source_format=DirectoryOf[T])  # type: ignore[misc]
-@python.define(outputs={"out_file": TypedSet})  # type: ignore[misc]
+@converter(target_format=SetOf[T], source_format=DirectoryOf[T])  # type: ignore[untyped-decorator]
+@python.define(outputs={"out_file": TypedSet})  # type: ignore[untyped-decorator]
 def list_dir_contents(in_file: TypedDirectory) -> TypedSet:
     classified_set: ty.Type[TypedSet] = SetOf.__class_getitem__(*in_file.content_types)  # type: ignore[assignment, arg-type]
     return classified_set(in_file.contents)
 
 
-@converter(target_format=DirectoryOf[T], source_format=SetOf[T])  # type: ignore[misc]
-@python.define(outputs={"out_file": TypedDirectory})  # type: ignore[misc]
+@converter(target_format=DirectoryOf[T], source_format=SetOf[T])  # type: ignore[untyped-decorator]
+@python.define(outputs={"out_file": TypedDirectory})  # type: ignore[untyped-decorator]
 def put_contents_in_dir(
     in_file: TypedSet,
     out_dir: ty.Optional[Path] = None,

extras/fileformats/extras/image/converters.py

@@ -1,17 +1,19 @@
-from pathlib import Path
-import typing as ty
 import tempfile
+import typing as ty
+from pathlib import Path
+
 from pydra.compose import python
+
 from fileformats.core import converter
-from fileformats.image.raster import RasterImage, Bitmap, Gif, Jpeg, Png, Tiff
+from fileformats.image.raster import Bitmap, Gif, Jpeg, Png, RasterImage, Tiff
 
 
-@converter(target_format=Bitmap, output_format=Bitmap)  # type: ignore[misc]
-@converter(target_format=Gif, output_format=Gif)  # type: ignore[misc]
-@converter(target_format=Jpeg, output_format=Jpeg)  # type: ignore[misc]
-@converter(target_format=Png, output_format=Png)  # type: ignore[misc]
-@converter(target_format=Tiff, output_format=Tiff)  # type: ignore[misc]
-@python.define(outputs={"out_file": RasterImage})  # type: ignore[misc]
+@converter(target_format=Bitmap, output_format=Bitmap)  # type: ignore[untyped-decorator]
+@converter(target_format=Gif, output_format=Gif)  # type: ignore[untyped-decorator]
+@converter(target_format=Jpeg, output_format=Jpeg)  # type: ignore[untyped-decorator]
+@converter(target_format=Png, output_format=Png)  # type: ignore[untyped-decorator]
+@converter(target_format=Tiff, output_format=Tiff)  # type: ignore[untyped-decorator]
+@python.define(outputs={"out_file": RasterImage})  # type: ignore[untyped-decorator]
 def convert_image(
     in_file: RasterImage,
     output_format: ty.Type[RasterImage],

extras/fileformats/extras/testing/__init__.py

@@ -1,21 +1,21 @@
+from fileformats.extras.core import check_optional_dependency
 from pydra.compose import python
 
 from fileformats.core import converter, extra_implementation
-from fileformats.extras.core import check_optional_dependency
 from fileformats.testing import AbstractFile, ConvertibleToFile, EncodedText, MyFormat
 from fileformats.text import TextFile
 
 dummy_import = None
 
 
 @converter  # pyright: ignore[reportArgumentType]
-@python.define(outputs=["out_file"])  # type: ignore[misc]
+@python.define(outputs=["out_file"])  # type: ignore[untyped-decorator]
 def ConvertibleToConverter(in_file: AbstractFile) -> ConvertibleToFile:
     return ConvertibleToFile.sample()
 
 
 @converter  # pyright: ignore[reportArgumentType]
-@python.define(outputs=["out_file"])  # type: ignore[misc]
+@python.define(outputs=["out_file"])  # type: ignore[untyped-decorator]
 def EncodedFromTextConverter(in_file: TextFile, shift: int = 1) -> EncodedText:
     contents = in_file.read_text()
     # Encode by shifting ASCII codes forward by 1
@@ -26,7 +26,7 @@ def EncodedFromTextConverter(in_file: TextFile, shift: int = 1) -> EncodedText:
 
 
 @converter  # pyright: ignore[reportArgumentType]
-@python.define(outputs=["out_file"])  # type: ignore[misc]
+@python.define(outputs=["out_file"])  # type: ignore[untyped-decorator]
 def EncodedToTextConverter(in_file: EncodedText, shift: int = 1) -> TextFile:
     contents = in_file.read_text()
     # Decode by shifting ASCII codes back by 1

fileformats/core/converter_helpers.py

@@ -26,7 +26,7 @@ class SubtypeVar:
     AnyFileFormat = FileSet.type_var("AnyFileFormat")
 
     @converter
-    @python.define  # type: ignore[misc]
+    @python.define  # type: ignore[untyped-decorator]
     def unzip(in_file: Zip[AnyFileFormat], out_file: AnyFileFormat):
         ...
     """

fileformats/core/tests/test_classifiers.py

@@ -187,7 +187,7 @@ def test_file_classifiers7():
 
 @converter(source_format=F[A], target_format=H[A])  # Additional converter
 @converter
-@python.define(outputs=["out_file"])  # type: ignore[misc]
+@python.define(outputs=["out_file"])  # type: ignore[untyped-decorator]
 def f2h(in_file: F) -> H:
     return in_file
 
@@ -212,7 +212,7 @@ def test_qualifier_converters():
 @converter(source_format=K[C, D], target_format=L[D, C])
 @converter(source_format=K[A, B, C], target_format=L[A, B])
 @converter(source_format=K[A, C, B], target_format=L[C, A])
-@python.define(outputs=["out_file"])  # type: ignore[misc]
+@python.define(outputs=["out_file"])  # type: ignore[untyped-decorator]
 def k2l(in_file: K) -> L:
     return in_file
 
@@ -313,19 +313,19 @@ def test_arrays():
 
 
 @converter
-@python.define(outputs=["out_file"])  # type: ignore[misc]
+@python.define(outputs=["out_file"])  # type: ignore[untyped-decorator]
 def f2n_template(in_file: F[SpecificDataType]) -> N[SpecificDataType]:
     return in_file
 
 
 @converter
-@python.define(outputs=["out_file"])  # type: ignore[misc]
+@python.define(outputs=["out_file"])  # type: ignore[untyped-decorator]
 def f2p_template(in_file: F[SpecificDataType]) -> P[SpecificDataType]:
     return in_file
 
 
 @converter
-@python.define(outputs=["out_file"])  # type: ignore[misc]
+@python.define(outputs=["out_file"])  # type: ignore[untyped-decorator]
 def p2n_template(in_file: P[SpecificDataType]) -> N[SpecificDataType]:
     return in_file
 
@@ -340,13 +340,13 @@ def test_wildcard_template_from_template_conversion():
 
 
 @converter
-@python.define(outputs=["out_file"])  # type: ignore[misc]
+@python.define(outputs=["out_file"])  # type: ignore[untyped-decorator]
 def generic2f(in_file: SpecificDataType) -> F[SpecificDataType]:
     return in_file
 
 
 @converter
-@python.define(outputs=["out_file"])  # type: ignore[misc]
+@python.define(outputs=["out_file"])  # type: ignore[untyped-decorator]
 def generic2n(in_file: SpecificDataType) -> N[SpecificDataType, H]:
     return in_file
 
@@ -382,13 +382,13 @@ def test_wildcard_template_from_generic_conversion6():
 
 
 @converter
-@python.define(outputs=["out_file"])  # type: ignore[misc]
+@python.define(outputs=["out_file"])  # type: ignore[untyped-decorator]
 def f2generic(in_file: F[SpecificFileSet]) -> SpecificFileSet:
     return in_file
 
 
 @converter
-@python.define(outputs=["out_file"])  # type: ignore[misc]
+@python.define(outputs=["out_file"])  # type: ignore[untyped-decorator]
 def n2generic(in_file: N[SpecificFileSet, G]) -> SpecificFileSet:
     return in_file
 
@@ -406,7 +406,7 @@ def test_wildcard_generic_from_multi_template_conversion():
 
 
 @converter
-@python.define(outputs=["out_file"])  # type: ignore[misc]
+@python.define(outputs=["out_file"])  # type: ignore[untyped-decorator]
 def l2r(in_file: L[A, SpecificFileSet, C]) -> R[A, SpecificFileSet, C, D]:
     return in_file