Skip to content

Commit edd8e81

Browse files
GlassOfWhiskeyGlassOfWhiskey
committed
Regenerate parsers with native ints
1 parent 1ed986c commit edd8e81

File tree

3 files changed

+72
-66
lines changed

3 files changed

+72
-66
lines changed

‎cwl_utils/parser/cwl_v1_0.py‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from collections.abc import Collection # pylint: disable=unused-import # noqa: F401
1919
from io import StringIO
2020
from itertools import chain
21-
from mypy_extensions import trait
21+
from mypy_extensions import i32, i64, trait
2222
from typing import Any, Final, Generic, TypeAlias, TypeVar, cast
2323
from typing import ClassVar, Literal, Mapping # pylint: disable=unused-import # noqa: F401
2424
from urllib.parse import quote, urldefrag, urlparse, urlsplit, urlunsplit
@@ -265,7 +265,7 @@ def load_field(
265265

266266

267267
save_type: TypeAlias = (
268-
None | MutableMapping[str, Any] | MutableSequence[Any] | int | float | bool | str
268+
None | MutableMapping[str, Any] | MutableSequence[Any] | i32 | i64 | float | bool | str
269269
)
270270

271271

@@ -343,7 +343,7 @@ def save(
343343
for key in val:
344344
newdict[key] = save(val[key], top=False, base_url=base_url, relative_uris=relative_uris)
345345
return newdict
346-
if val is None or isinstance(val, (int, float, bool, str)):
346+
if val is None or isinstance(val, (i32, i64, float, bool, str)):
347347
return val
348348
raise Exception("Not Saveable: %s" % type(val))
349349

@@ -3974,7 +3974,7 @@ def __init__(
39743974
nameroot: None | str = None,
39753975
nameext: None | str = None,
39763976
checksum: None | str = None,
3977-
size: None | int = None,
3977+
size: None | i32 = None,
39783978
secondaryFiles: None | Sequence[Directory | File] = None,
39793979
format: None | str = None,
39803980
contents: None | str = None,
@@ -9389,7 +9389,7 @@ def save(
93899389
def __init__(
93909390
self,
93919391
loadContents: None | bool = None,
9392-
position: None | int = None,
9392+
position: None | i32 = None,
93939393
prefix: None | str = None,
93949394
separate: None | bool = None,
93959395
itemSeparator: None | str = None,
@@ -14687,9 +14687,9 @@ def __init__(
1468714687
stdin: None | str = None,
1468814688
stderr: None | str = None,
1468914689
stdout: None | str = None,
14690-
successCodes: None | Sequence[int] = None,
14691-
temporaryFailCodes: None | Sequence[int] = None,
14692-
permanentFailCodes: None | Sequence[int] = None,
14690+
successCodes: None | Sequence[i32] = None,
14691+
temporaryFailCodes: None | Sequence[i32] = None,
14692+
permanentFailCodes: None | Sequence[i32] = None,
1469314693
extension_fields: MutableMapping[str, Any] | None = None,
1469414694
loadingOptions: LoadingOptions | None = None,
1469514695
) -> None:
@@ -17011,14 +17011,14 @@ def save(
1701117011

1701217012
def __init__(
1701317013
self,
17014-
coresMin: None | int | str = None,
17015-
coresMax: None | int | str = None,
17016-
ramMin: None | int | str = None,
17017-
ramMax: None | int | str = None,
17018-
tmpdirMin: None | int | str = None,
17019-
tmpdirMax: None | int | str = None,
17020-
outdirMin: None | int | str = None,
17021-
outdirMax: None | int | str = None,
17014+
coresMin: None | i32 | str = None,
17015+
coresMax: None | i32 | str = None,
17016+
ramMin: None | i32 | str = None,
17017+
ramMax: None | i32 | str = None,
17018+
tmpdirMin: None | i32 | str = None,
17019+
tmpdirMax: None | i32 | str = None,
17020+
outdirMin: None | i32 | str = None,
17021+
outdirMax: None | i32 | str = None,
1702217022
extension_fields: MutableMapping[str, Any] | None = None,
1702317023
loadingOptions: LoadingOptions | None = None,
1702417024
) -> None:
@@ -22175,7 +22175,7 @@ def save(
2217522175

2217622176
def __init__(
2217722177
self,
22178-
timelimit: int | str,
22178+
timelimit: i32 | str,
2217922179
extension_fields: MutableMapping[str, Any] | None = None,
2218022180
loadingOptions: LoadingOptions | None = None,
2218122181
) -> None:
@@ -23391,7 +23391,7 @@ def save(
2339123391

2339223392
def __init__(
2339323393
self,
23394-
processes: int | str,
23394+
processes: i32 | str,
2339523395
extension_fields: MutableMapping[str, Any] | None = None,
2339623396
loadingOptions: LoadingOptions | None = None,
2339723397
) -> None:
@@ -23751,8 +23751,8 @@ def __init__(
2375123751
self,
2375223752
cudaComputeCapability: Sequence[str] | str,
2375323753
cudaVersionMin: str,
23754-
cudaDeviceCountMax: None | int | str = None,
23755-
cudaDeviceCountMin: None | int | str = None,
23754+
cudaDeviceCountMax: None | i32 | str = None,
23755+
cudaDeviceCountMin: None | i32 | str = None,
2375623756
extension_fields: MutableMapping[str, Any] | None = None,
2375723757
loadingOptions: LoadingOptions | None = None,
2375823758
) -> None:
@@ -24197,11 +24197,12 @@ def __init__(
2419724197
})
2419824198

2419924199
strtype: Final = _PrimitiveLoader(str)
24200-
inttype: Final = _PrimitiveLoader(int)
24200+
inttype: Final = _PrimitiveLoader(i32)
2420124201
floattype: Final = _PrimitiveLoader(float)
2420224202
booltype: Final = _PrimitiveLoader(bool)
2420324203
None_type: Final = _PrimitiveLoader(type(None))
2420424204
Any_type: Final = _AnyLoader()
24205+
longtype: Final = _PrimitiveLoader(i64)
2420524206
PrimitiveTypeLoader: Final = _EnumLoader(
2420624207
(
2420724208
"null",
@@ -25549,6 +25550,7 @@ def __init__(
2554925550
(
2555025551
booltype,
2555125552
inttype,
25553+
longtype,
2555225554
floattype,
2555325555
strtype,
2555425556
FileLoader,
@@ -25558,7 +25560,7 @@ def __init__(
2555825560
)
2555925561
)
2556025562
CWLObjectType: TypeAlias = (
25561-
"Directory | File | Mapping[str, CWLObjectType | None] | Sequence[CWLObjectType | None] | bool | float | int | str"
25563+
"Directory | File | Mapping[str, CWLObjectType | None] | Sequence[CWLObjectType | None] | bool | float | i32 | i64 | str"
2556225564
)
2556325565

2556425566

‎cwl_utils/parser/cwl_v1_1.py‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from collections.abc import Collection # pylint: disable=unused-import # noqa: F401
1919
from io import StringIO
2020
from itertools import chain
21-
from mypy_extensions import trait
21+
from mypy_extensions import i32, i64, trait
2222
from typing import Any, Final, Generic, TypeAlias, TypeVar, cast
2323
from typing import ClassVar, Literal, Mapping # pylint: disable=unused-import # noqa: F401
2424
from urllib.parse import quote, urldefrag, urlparse, urlsplit, urlunsplit
@@ -265,7 +265,7 @@ def load_field(
265265

266266

267267
save_type: TypeAlias = (
268-
None | MutableMapping[str, Any] | MutableSequence[Any] | int | float | bool | str
268+
None | MutableMapping[str, Any] | MutableSequence[Any] | i32 | i64 | float | bool | str
269269
)
270270

271271

@@ -343,7 +343,7 @@ def save(
343343
for key in val:
344344
newdict[key] = save(val[key], top=False, base_url=base_url, relative_uris=relative_uris)
345345
return newdict
346-
if val is None or isinstance(val, (int, float, bool, str)):
346+
if val is None or isinstance(val, (i32, i64, float, bool, str)):
347347
return val
348348
raise Exception("Not Saveable: %s" % type(val))
349349

@@ -3974,7 +3974,7 @@ def __init__(
39743974
nameroot: None | str = None,
39753975
nameext: None | str = None,
39763976
checksum: None | str = None,
3977-
size: None | int = None,
3977+
size: None | i32 = None,
39783978
secondaryFiles: None | Sequence[Directory | File] = None,
39793979
format: None | str = None,
39803980
contents: None | str = None,
@@ -9536,7 +9536,7 @@ def save(
95369536
def __init__(
95379537
self,
95389538
loadContents: None | bool = None,
9539-
position: None | int | str = None,
9539+
position: None | i32 | str = None,
95409540
prefix: None | str = None,
95419541
separate: None | bool = None,
95429542
itemSeparator: None | str = None,
@@ -16004,9 +16004,9 @@ def __init__(
1600416004
stdin: None | str = None,
1600516005
stderr: None | str = None,
1600616006
stdout: None | str = None,
16007-
successCodes: None | Sequence[int] = None,
16008-
temporaryFailCodes: None | Sequence[int] = None,
16009-
permanentFailCodes: None | Sequence[int] = None,
16007+
successCodes: None | Sequence[i32] = None,
16008+
temporaryFailCodes: None | Sequence[i32] = None,
16009+
permanentFailCodes: None | Sequence[i32] = None,
1601016010
extension_fields: MutableMapping[str, Any] | None = None,
1601116011
loadingOptions: LoadingOptions | None = None,
1601216012
) -> None:
@@ -18346,14 +18346,14 @@ def save(
1834618346

1834718347
def __init__(
1834818348
self,
18349-
coresMin: None | int | str = None,
18350-
coresMax: None | int | str = None,
18351-
ramMin: None | int | str = None,
18352-
ramMax: None | int | str = None,
18353-
tmpdirMin: None | int | str = None,
18354-
tmpdirMax: None | int | str = None,
18355-
outdirMin: None | int | str = None,
18356-
outdirMax: None | int | str = None,
18349+
coresMin: None | i32 | str = None,
18350+
coresMax: None | i32 | str = None,
18351+
ramMin: None | i32 | str = None,
18352+
ramMax: None | i32 | str = None,
18353+
tmpdirMin: None | i32 | str = None,
18354+
tmpdirMax: None | i32 | str = None,
18355+
outdirMin: None | i32 | str = None,
18356+
outdirMax: None | i32 | str = None,
1835718357
extension_fields: MutableMapping[str, Any] | None = None,
1835818358
loadingOptions: LoadingOptions | None = None,
1835918359
) -> None:
@@ -19151,7 +19151,7 @@ def save(
1915119151

1915219152
def __init__(
1915319153
self,
19154-
timelimit: int | str,
19154+
timelimit: i32 | str,
1915519155
extension_fields: MutableMapping[str, Any] | None = None,
1915619156
loadingOptions: LoadingOptions | None = None,
1915719157
) -> None:
@@ -25420,7 +25420,7 @@ def save(
2542025420

2542125421
def __init__(
2542225422
self,
25423-
processes: int | str,
25423+
processes: i32 | str,
2542425424
extension_fields: MutableMapping[str, Any] | None = None,
2542525425
loadingOptions: LoadingOptions | None = None,
2542625426
) -> None:
@@ -25780,8 +25780,8 @@ def __init__(
2578025780
self,
2578125781
cudaComputeCapability: Sequence[str] | str,
2578225782
cudaVersionMin: str,
25783-
cudaDeviceCountMax: None | int | str = None,
25784-
cudaDeviceCountMin: None | int | str = None,
25783+
cudaDeviceCountMax: None | i32 | str = None,
25784+
cudaDeviceCountMin: None | i32 | str = None,
2578525785
extension_fields: MutableMapping[str, Any] | None = None,
2578625786
loadingOptions: LoadingOptions | None = None,
2578725787
) -> None:
@@ -26254,11 +26254,12 @@ def __init__(
2625426254
})
2625526255

2625626256
strtype: Final = _PrimitiveLoader(str)
26257-
inttype: Final = _PrimitiveLoader(int)
26257+
inttype: Final = _PrimitiveLoader(i32)
2625826258
floattype: Final = _PrimitiveLoader(float)
2625926259
booltype: Final = _PrimitiveLoader(bool)
2626026260
None_type: Final = _PrimitiveLoader(type(None))
2626126261
Any_type: Final = _AnyLoader()
26262+
longtype: Final = _PrimitiveLoader(i64)
2626226263
PrimitiveTypeLoader: Final = _EnumLoader(
2626326264
(
2626426265
"null",
@@ -27707,6 +27708,7 @@ def __init__(
2770727708
(
2770827709
booltype,
2770927710
inttype,
27711+
longtype,
2771027712
floattype,
2771127713
strtype,
2771227714
FileLoader,
@@ -27716,7 +27718,7 @@ def __init__(
2771627718
)
2771727719
)
2771827720
CWLObjectType: TypeAlias = (
27719-
"Directory | File | Mapping[str, CWLObjectType | None] | Sequence[CWLObjectType | None] | bool | float | int | str"
27721+
"Directory | File | Mapping[str, CWLObjectType | None] | Sequence[CWLObjectType | None] | bool | float | i32 | i64 | str"
2772027722
)
2772127723

2772227724

0 commit comments

Comments
 (0)