|
1 | | -import typing as ty |
2 | | -import attrs |
3 | 1 | from pathlib import Path |
| 2 | + |
| 3 | +import attrs |
4 | 4 | import pytest |
5 | 5 | from pydra.compose import python, shell |
6 | | -from fileformats.generic import File, FileSet |
7 | | -from fileformats.testing import Foo, Bar, Baz, Qux |
8 | | -from fileformats.testing import ConvertibleToFile, ConcreteClass, AnotherConcreteClass |
| 6 | + |
| 7 | +from conftest import write_test_file |
9 | 8 | from fileformats.core import converter |
10 | 9 | from fileformats.core.exceptions import FormatConversionError |
11 | | -from conftest import write_test_file |
| 10 | +from fileformats.generic import File, FileSet |
| 11 | +from fileformats.testing import ( |
| 12 | + AnotherConcreteClass, |
| 13 | + Bar, |
| 14 | + Baz, |
| 15 | + ConcreteClass, |
| 16 | + ConvertibleToFile, |
| 17 | + Foo, |
| 18 | + Qux, |
| 19 | +) |
12 | 20 |
|
13 | 21 |
|
14 | 22 | @converter |
@@ -95,13 +103,13 @@ def test_convert_mapped_conversion(work_dir): |
95 | 103 | @pytest.mark.parametrize( |
96 | 104 | ["klass", "convertible_from"], |
97 | 105 | [ |
98 | | - [Bar, ty.Union[Bar, Baz, Foo]], |
99 | | - [Qux, ty.Union[Foo, Qux]], |
| 106 | + [Bar, Bar | Baz | Foo], |
| 107 | + [Qux, Foo | Qux], |
100 | 108 | [Foo, Foo], |
101 | 109 | [Baz, Baz], |
102 | 110 | [ |
103 | 111 | ConvertibleToFile, |
104 | | - ty.Union[AnotherConcreteClass, ConcreteClass, ConvertibleToFile], |
| 112 | + AnotherConcreteClass | ConcreteClass | ConvertibleToFile, |
105 | 113 | ], |
106 | 114 | ], |
107 | 115 | ) |
|
0 commit comments