Skip to content

Commit

Permalink
Merge pull request cylc#6162 from cylc/8.3.x-sync
Browse files Browse the repository at this point in the history
🤖 Merge 8.3.x-sync into master
  • Loading branch information
oliver-sanders authored Jun 20, 2024
2 parents a967c00 + 62527e0 commit a848d29
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion cylc/flow/xtrigger_mgr.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
)

from cylc.flow import LOG
from cylc.flow.exceptions import XtriggerConfigError
from cylc.flow.exceptions import WorkflowConfigError, XtriggerConfigError
import cylc.flow.flags
from cylc.flow.hostuserutil import get_user
from cylc.flow.subprocctx import add_kwarg_to_sig
Expand Down Expand Up @@ -362,6 +362,8 @@ def _try_xtrig_validate_func(
try:
xtrig_validate_func(bound_args.arguments)
except Exception as exc: # Note: catch all errors
if not isinstance(exc, WorkflowConfigError):
LOG.exception(exc)
raise XtriggerConfigError(label, signature_str, exc)

# BACK COMPAT: workflow_state_backcompat
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ python_requires = >=3.7
install_requires =
ansimarkup>=1.0.0
async-timeout>=3.0.0
colorama>=0.4,<=1
colorama>=0.4,<1
graphene>=2.1,<3
# Note: can't pin jinja2 any higher than this until we give up on Cylc 7 back-compat
jinja2==3.0.*
Expand Down

0 comments on commit a848d29

Please sign in to comment.