Skip to content

Commit 747be06

Browse files
authored
evg: remove workaround for missing teardown_task_can_fail_task field (#1267)
1 parent b6bf0a1 commit 747be06

File tree

4 files changed

+9
-20
lines changed

4 files changed

+9
-20
lines changed

.evergreen/config_generator/components/abi_stability.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
from config_generator.etc.distros import find_large_distro
44
from config_generator.etc.function import Function, merge_defns
5-
from config_generator.etc.utils import TaskGroup, bash_exec
5+
from config_generator.etc.utils import bash_exec
66

7+
from shrub.v3.evg_build_variant import BuildVariant, DisplayTask
78
from shrub.v3.evg_command import EvgCommandType, git_get_project, s3_put
89
from shrub.v3.evg_task import EvgTask, EvgTaskRef
9-
from shrub.v3.evg_build_variant import BuildVariant, DisplayTask
10+
from shrub.v3.evg_task_group import EvgTaskGroup
1011

1112

1213
TAG = 'abi-stability'
@@ -149,7 +150,7 @@ def tasks():
149150

150151
def task_groups():
151152
return [
152-
TaskGroup(
153+
EvgTaskGroup(
153154
name=f'tg-{TAG}',
154155
max_hosts=-1,
155156
setup_group_can_fail_task=True,

.evergreen/config_generator/etc/utils.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
from shrub.v3.evg_project import EvgProject
1212
from shrub.v3.shrub_service import ConfigDumper
1313
from shrub.v3.evg_task import EvgTaskRef
14-
from shrub.v3.evg_task_group import EvgTaskGroup
1514
from typing_extensions import get_args, get_origin, get_type_hints
1615

1716
T = TypeVar('T')
@@ -28,17 +27,6 @@ class TaskRef(EvgTaskRef):
2827
batchtime: int | None = None
2928

3029

31-
# Equivalent to EvgTaskGroup but defines additional properties.
32-
class TaskGroup(EvgTaskGroup):
33-
"""
34-
An evergreen task group model that also includes additional properties.
35-
36-
(The shrub.py model is missing some properties)
37-
"""
38-
39-
teardown_task_can_fail_task: bool | None = None
40-
41-
4230
# Automatically formats the provided script and invokes it in Bash.
4331
def bash_exec(
4432
script,

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dev = [
1010
# .evergreen/config_generator/generate.py
1111
"packaging>=14.0",
1212
"pydantic>=2.7",
13-
"shrub-py>=3.3.1",
13+
"shrub-py>=3.4.0",
1414

1515
# etc/make_release.py
1616
"click>=6.0",

uv.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)