Skip to content

Commit 1c582d9

Browse files
committed
Partially revert "schema: add first-parent descendants (#6610)"
This partially reverts commit bc1b460.
1 parent 01c2308 commit 1c582d9

File tree

5 files changed

+28
-46
lines changed

5 files changed

+28
-46
lines changed

cylc/flow/data_messages.proto

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,6 @@ message PbFamily {
254254
repeated string child_families = 9;
255255
optional string first_parent = 10;
256256
optional PbRuntime runtime = 11;
257-
repeated string descendants = 12;
258257
}
259258

260259
message PbFamilyProxy {

cylc/flow/data_messages_pb2.py

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

cylc/flow/data_messages_pb2.pyi

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ class PbTaskProxy(_message.Message):
393393
def __init__(self, stamp: _Optional[str] = ..., id: _Optional[str] = ..., task: _Optional[str] = ..., state: _Optional[str] = ..., cycle_point: _Optional[str] = ..., depth: _Optional[int] = ..., job_submits: _Optional[int] = ..., outputs: _Optional[_Mapping[str, PbOutput]] = ..., namespace: _Optional[_Iterable[str]] = ..., prerequisites: _Optional[_Iterable[_Union[PbPrerequisite, _Mapping]]] = ..., jobs: _Optional[_Iterable[str]] = ..., first_parent: _Optional[str] = ..., name: _Optional[str] = ..., is_held: bool = ..., edges: _Optional[_Iterable[str]] = ..., ancestors: _Optional[_Iterable[str]] = ..., flow_nums: _Optional[str] = ..., external_triggers: _Optional[_Mapping[str, PbTrigger]] = ..., xtriggers: _Optional[_Mapping[str, PbTrigger]] = ..., is_queued: bool = ..., is_runahead: bool = ..., flow_wait: bool = ..., runtime: _Optional[_Union[PbRuntime, _Mapping]] = ..., graph_depth: _Optional[int] = ..., is_retry: bool = ..., is_wallclock: bool = ..., is_xtriggered: bool = ...) -> None: ...
394394

395395
class PbFamily(_message.Message):
396-
__slots__ = ("stamp", "id", "name", "meta", "depth", "proxies", "parents", "child_tasks", "child_families", "first_parent", "runtime", "descendants")
396+
__slots__ = ("stamp", "id", "name", "meta", "depth", "proxies", "parents", "child_tasks", "child_families", "first_parent", "runtime")
397397
STAMP_FIELD_NUMBER: _ClassVar[int]
398398
ID_FIELD_NUMBER: _ClassVar[int]
399399
NAME_FIELD_NUMBER: _ClassVar[int]
@@ -405,7 +405,6 @@ class PbFamily(_message.Message):
405405
CHILD_FAMILIES_FIELD_NUMBER: _ClassVar[int]
406406
FIRST_PARENT_FIELD_NUMBER: _ClassVar[int]
407407
RUNTIME_FIELD_NUMBER: _ClassVar[int]
408-
DESCENDANTS_FIELD_NUMBER: _ClassVar[int]
409408
stamp: str
410409
id: str
411410
name: str
@@ -417,8 +416,7 @@ class PbFamily(_message.Message):
417416
child_families: _containers.RepeatedScalarFieldContainer[str]
418417
first_parent: str
419418
runtime: PbRuntime
420-
descendants: _containers.RepeatedScalarFieldContainer[str]
421-
def __init__(self, stamp: _Optional[str] = ..., id: _Optional[str] = ..., name: _Optional[str] = ..., meta: _Optional[_Union[PbMeta, _Mapping]] = ..., depth: _Optional[int] = ..., proxies: _Optional[_Iterable[str]] = ..., parents: _Optional[_Iterable[str]] = ..., child_tasks: _Optional[_Iterable[str]] = ..., child_families: _Optional[_Iterable[str]] = ..., first_parent: _Optional[str] = ..., runtime: _Optional[_Union[PbRuntime, _Mapping]] = ..., descendants: _Optional[_Iterable[str]] = ...) -> None: ...
419+
def __init__(self, stamp: _Optional[str] = ..., id: _Optional[str] = ..., name: _Optional[str] = ..., meta: _Optional[_Union[PbMeta, _Mapping]] = ..., depth: _Optional[int] = ..., proxies: _Optional[_Iterable[str]] = ..., parents: _Optional[_Iterable[str]] = ..., child_tasks: _Optional[_Iterable[str]] = ..., child_families: _Optional[_Iterable[str]] = ..., first_parent: _Optional[str] = ..., runtime: _Optional[_Union[PbRuntime, _Mapping]] = ...) -> None: ...
422420

423421
class PbFamilyProxy(_message.Message):
424422
__slots__ = ("stamp", "id", "cycle_point", "name", "family", "state", "depth", "first_parent", "child_tasks", "child_families", "is_held", "ancestors", "states", "state_totals", "is_held_total", "is_queued", "is_queued_total", "is_runahead", "is_runahead_total", "runtime", "graph_depth", "is_retry", "is_wallclock", "is_xtriggered")

cylc/flow/data_store_mgr.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,6 @@ def generate_definition_elements(self):
695695
id=f_id,
696696
name=name,
697697
depth=len(ancestors[name]) - 1,
698-
descendants=list(descendants.get(name, [])),
699698
)
700699
famcfg = config.cfg['runtime'][name]
701700
user_defined_meta = {}

cylc/flow/network/schema.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,20 +1274,6 @@ class Meta:
12741274
delta_store=DELTA_STORE_DEFAULT,
12751275
delta_type=DELTA_TYPE_DEFAULT,
12761276
resolver=get_nodes_by_ids)
1277-
descendants = graphene.List(
1278-
String,
1279-
description=sstrip('''
1280-
Linearised first-parent descendants.
1281-
1282-
Inheritance in Cylc provides two functions:
1283-
* Allowing tasks to inherit common configurations.
1284-
* Defining a family/task hierarchy for visualisation purposes.
1285-
(the linearised first-parent hierarchy).
1286-
1287-
The visual hierarchy follows the first-parent of a family which
1288-
may differ from the full inheritance hierarchy.
1289-
'''),
1290-
)
12911277
first_parent = Field(
12921278
lambda: Family,
12931279
description='Family first parent.',

0 commit comments

Comments
 (0)