Skip to content

Commit

Permalink
Fix ruffs after rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
fritzm committed Oct 23, 2023
1 parent 814955b commit 84e17a2
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/lsst/cmservice/cli/options.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from collections.abc import Callable
from enum import Enum, auto
from functools import partial
from typing import Any, Callable, Type
from typing import Any

import click
from click.decorators import FC
Expand Down
8 changes: 7 additions & 1 deletion src/lsst/cmservice/db/job.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@
from .step import Step

if TYPE_CHECKING:
from .campaign import Campaign
from .pipetask_error import PipetaskError
from .product_set import ProductSet
from .production import Production
from .script import Script
from .task_set import TaskSet
from .wms_task_report import WmsTaskReport
Expand Down Expand Up @@ -68,7 +70,11 @@ class Job(Base, ElementMixin):
"Production",
primaryjoin="Job.parent_id==Group.id",
secondary="join(Group, Step).join(Campaign).join(Production)",
secondaryjoin="and_(Group.parent_id==Step.id, Step.parent_id==Campaign.id, Campaign.parent_id==Production.id,) ",
secondaryjoin="and_("
"Group.parent_id==Step.id, "
"Step.parent_id==Campaign.id, "
"Campaign.parent_id==Production.id, "
") ",
viewonly=True,
)
parent_: Mapped["Group"] = relationship("Group", viewonly=True)
Expand Down
1 change: 1 addition & 0 deletions src/lsst/cmservice/db/step.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

if TYPE_CHECKING:
from .group import Group
from .job import Job
from .production import Production
from .script import Script
from .step_dependency import StepDependency
Expand Down

0 comments on commit 84e17a2

Please sign in to comment.