Skip to content

Commit 44ccdec

Browse files
authored
Merge pull request #3122 from IntersectMBO/check_with_pyright
Check types with pyright
2 parents cba973f + 6c7ca02 commit 44ccdec

34 files changed

+184
-48
lines changed

.pre-commit-config.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,8 @@ repos:
5252
entry: mypy
5353
language: system
5454
types: [python]
55+
- id: pyright
56+
name: pyright
57+
entry: pyright
58+
language: system
59+
types: [python]

cardano_node_tests/cardano_cli_coverage.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757

5858
def get_args() -> argparse.Namespace:
5959
"""Get script command line arguments."""
60-
parser = argparse.ArgumentParser(description=__doc__.split("\n", maxsplit=1)[0])
60+
parser = argparse.ArgumentParser(description=(__doc__ or "").split("\n", maxsplit=1)[0])
6161
parser.add_argument(
6262
"-i",
6363
"--input-files",

cardano_node_tests/chang_us_coverage.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
def get_args() -> argparse.Namespace:
1616
"""Get command line arguments."""
17-
parser = argparse.ArgumentParser(description=__doc__.split("\n", maxsplit=1)[0])
17+
parser = argparse.ArgumentParser(description=(__doc__ or "").split("\n", maxsplit=1)[0])
1818
parser.add_argument(
1919
"-i",
2020
"--input-file",

cardano_node_tests/cluster_management/cluster_getter.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@
3333
_xdist_sleep = time.sleep
3434
else:
3535

36-
def _xdist_sleep(
37-
secs: float,
38-
) -> None:
36+
def _xdist_sleep(seconds: float, /) -> None:
3937
"""No need to sleep if tests are running on a single worker."""
4038

4139

@@ -167,6 +165,7 @@ def _netstat_log_func(msg: str) -> None:
167165
excp: Exception | None = None
168166
netstat_out = ""
169167
ports = self.ports
168+
cluster_obj = None
170169
for i in range(2):
171170
if i > 0:
172171
self.log(
@@ -234,6 +233,11 @@ def _netstat_log_func(msg: str) -> None:
234233
status_files.create_cluster_dead_file(instance_num=self.cluster_instance_num)
235234
return False
236235

236+
if cluster_obj is None:
237+
# Should never reach this
238+
self.log(f"c{self.cluster_instance_num}: failed to start cluster")
239+
return False
240+
237241
# Generate ID for the new cluster instance so it is possible to match log entries with
238242
# cluster instance files saved as artifacts.
239243
cluster_instance_id = helpers.get_rand_str(8)

cardano_node_tests/defragment_utxos.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
def get_args() -> argparse.Namespace:
1919
"""Get command line arguments."""
20-
parser = argparse.ArgumentParser(description=__doc__.split("\n", maxsplit=1)[0])
20+
parser = argparse.ArgumentParser(description=(__doc__ or "").split("\n", maxsplit=1)[0])
2121
parser.add_argument(
2222
"-a",
2323
"--address",

cardano_node_tests/dump_requirements_coverage.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
def get_args() -> argparse.Namespace:
1616
"""Get command line arguments."""
17-
parser = argparse.ArgumentParser(description=__doc__.split("\n", maxsplit=1)[0])
17+
parser = argparse.ArgumentParser(description=(__doc__ or "").split("\n", maxsplit=1)[0])
1818
parser.add_argument(
1919
"-m",
2020
"--requirements-mapping",

cardano_node_tests/prepare_cluster_scripts.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
def get_args() -> argparse.Namespace:
2323
"""Get command line arguments."""
24-
parser = argparse.ArgumentParser(description=__doc__.split("\n", maxsplit=1)[0])
24+
parser = argparse.ArgumentParser(description=(__doc__ or "").split("\n", maxsplit=1)[0])
2525
parser.add_argument(
2626
"-d",
2727
"--dest-dir",

cardano_node_tests/pytest_plugins/xdist_scheduler.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def _split_scope(self, nodeid: str) -> str:
6767

6868
return comps[1] # nodeid has a group name
6969

70-
def _is_long_pending(self, assigned_to_node: collections.OrderedDict) -> bool:
70+
def _is_long_pending(self, assigned_to_node: dict) -> bool:
7171
"""Return True if there is a long-running test pending."""
7272
for nodeids_dict in assigned_to_node.values():
7373
for nodeid, is_completed in nodeids_dict.items():
@@ -104,7 +104,7 @@ def _assign_work_unit(self, node: workermanage.WorkerController) -> None:
104104
scope, work_unit = None, None
105105

106106
# Check if there are any long-running tests already pending
107-
# pyrefly: ignore # bad-argument-type
107+
108108
long_pending = self._is_long_pending(assigned_to_node)
109109

110110
if long_pending:

cardano_node_tests/split_topology.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
def get_args() -> argparse.Namespace:
1818
"""Get command line arguments."""
19-
parser = argparse.ArgumentParser(description=__doc__.split("\n", maxsplit=1)[0])
19+
parser = argparse.ArgumentParser(description=(__doc__ or "").split("\n", maxsplit=1)[0])
2020
parser.add_argument(
2121
"-d",
2222
"--dest-dir",

cardano_node_tests/testnet_cleanup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
def get_args() -> argparse.Namespace:
2525
"""Get command line arguments."""
26-
parser = argparse.ArgumentParser(description=__doc__.split("\n", maxsplit=1)[0])
26+
parser = argparse.ArgumentParser(description=(__doc__ or "").split("\n", maxsplit=1)[0])
2727
parser.add_argument(
2828
"-a",
2929
"--artifacts-base-dir",

0 commit comments

Comments
 (0)