Skip to content

Commit f00367d

Browse files
committed
ci: fix type errors resulting from pyright upgrade
1 parent 1a017a1 commit f00367d

File tree

4 files changed

+17
-15
lines changed

4 files changed

+17
-15
lines changed

src/taskgraph/generator.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
import logging
77
import os
88
from dataclasses import dataclass
9-
from typing import Dict
9+
from typing import Callable, Dict, Optional, Union
1010

1111
from . import filter_tasks
1212
from .config import GraphConfig, load_graph_config
1313
from .graph import Graph
1414
from .morph import morph
1515
from .optimize.base import optimize_task_graph
16-
from .parameters import parameters_loader
16+
from .parameters import Parameters, parameters_loader
1717
from .task import Task
1818
from .taskgraph import TaskGraph
1919
from .transforms.base import TransformConfig, TransformSequence
@@ -119,10 +119,10 @@ class TaskGraphGenerator:
119119

120120
def __init__(
121121
self,
122-
root_dir,
123-
parameters,
124-
decision_task_id="DECISION-TASK",
125-
write_artifacts=False,
122+
root_dir: Optional[str],
123+
parameters: Union[Parameters, Callable[[GraphConfig], Parameters]],
124+
decision_task_id: str = "DECISION-TASK",
125+
write_artifacts: bool = False,
126126
):
127127
"""
128128
@param root_dir: root directory containing the Taskgraph config.yml file

src/taskgraph/optimize/base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ def replace_tasks(
365365

366366

367367
def get_subgraph(
368-
target_task_graph,
368+
target_task_graph: TaskGraph,
369369
removed_tasks,
370370
replaced_tasks,
371371
label_to_taskid,
@@ -431,7 +431,7 @@ def get_subgraph(
431431
decision_task_id=decision_task_id,
432432
dependencies=named_task_dependencies,
433433
)
434-
deps = task.task.setdefault("dependencies", []) # type: ignore
434+
deps = task.task.setdefault("dependencies", [])
435435
deps.extend(sorted(named_task_dependencies.values()))
436436
tasks_by_taskid[task.task_id] = task
437437

src/taskgraph/transforms/run/common.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,11 +170,8 @@ def support_caches(
170170
if use_caches is None:
171171
# Use project default values for filtering caches, default to
172172
# checkout cache if no selection is specified.
173-
use_caches = (
174-
config.graph_config.get("taskgraph", {})
175-
.get("run", {})
176-
.get("use-caches", ["checkout"])
177-
)
173+
taskgraph_config = config.graph_config.get("taskgrpah") or {}
174+
use_caches = taskgraph_config.get("run", {}).get("use-caches", ["checkout"])
178175

179176
for name, cache_cfg in CACHES.items():
180177
if not should_use_cache(name, use_caches, run["checkout"]):

src/taskgraph/util/parameterization.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55

66
import re
7+
from typing import Any, Dict
78

89
from taskgraph.util.taskcluster import get_artifact_url
910
from taskgraph.util.time import json_time_from_now
@@ -44,7 +45,9 @@ def resolve_timestamps(now, task_def):
4445
)
4546

4647

47-
def resolve_task_references(label, task_def, task_id, decision_task_id, dependencies):
48+
def resolve_task_references(
49+
label, task_def, task_id, decision_task_id, dependencies
50+
) -> Dict[str, Any]:
4851
"""Resolve all instances of ``{'task-reference': '..<..>..'} ``
4952
and ``{'artifact-reference`: '..<dependency/artifact/path>..'}``
5053
in the given task definition, using the given dependencies.
@@ -91,10 +94,12 @@ def repl(match):
9194

9295
return ARTIFACT_REFERENCE_PATTERN.sub(repl, val)
9396

94-
return _recurse(
97+
result = _recurse(
9598
task_def,
9699
{
97100
"task-reference": task_reference,
98101
"artifact-reference": artifact_reference,
99102
},
100103
)
104+
assert isinstance(result, dict)
105+
return result

0 commit comments

Comments
 (0)