Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reexport WorkflowFixtures from config module #10240

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/ert/config/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
from .summary_observation import SummaryObservation
from .surface_config import SurfaceConfig
from .workflow import Workflow
from .workflow_fixtures import WorkflowFixtures
from .workflow_job import WorkflowJob

__all__ = [
Expand Down Expand Up @@ -83,6 +84,7 @@
"UpdateSettings",
"WarningInfo",
"Workflow",
"WorkflowFixtures",
"WorkflowJob",
"capture_validation",
"field_transform",
Expand Down
4 changes: 1 addition & 3 deletions src/ert/config/ert_script.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@

from typing_extensions import deprecated

from ert.config.workflow_fixtures import WorkflowFixtures

if TYPE_CHECKING:
from ert.config import ErtConfig
from ert.config import ErtConfig, WorkflowFixtures
from ert.storage import Ensemble, Storage

Fixtures: TypeAlias = ErtConfig | Ensemble | Storage
Expand Down
3 changes: 1 addition & 2 deletions src/ert/gui/tools/plugins/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
import inspect
from typing import TYPE_CHECKING, Any

from ert.config import ErtPlugin
from ert.config.workflow_fixtures import WorkflowFixtures
from ert.config import ErtPlugin, WorkflowFixtures

if TYPE_CHECKING:
from PyQt6.QtWidgets import QWidget
Expand Down
3 changes: 1 addition & 2 deletions src/ert/gui/tools/plugins/plugin_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
from typing import TYPE_CHECKING, Any

from _ert.threading import ErtThread
from ert.config import CancelPluginException, ErtConfig
from ert.config.workflow_fixtures import WorkflowFixtures
from ert.config import CancelPluginException, ErtConfig, WorkflowFixtures
from ert.runpaths import Runpaths
from ert.workflow_runner import WorkflowJobRunner

Expand Down
3 changes: 1 addition & 2 deletions src/ert/run_models/base_run_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
AnalysisErrorEvent,
AnalysisEvent,
)
from ert.config import HookRuntime, QueueSystem, UpdateSettings
from ert.config import HookRuntime, QueueSystem, UpdateSettings, WorkflowFixtures
from ert.config.analysis_module import ESSettings
from ert.config.forward_model_step import ForwardModelStep
from ert.config.model_config import ModelConfig
Expand Down Expand Up @@ -58,7 +58,6 @@
from ert.utils import log_duration
from ert.workflow_runner import WorkflowRunner

from ..config.workflow_fixtures import WorkflowFixtures
from ..run_arg import RunArg
from .event import (
AnalysisStatusEvent,
Expand Down
9 changes: 7 additions & 2 deletions src/ert/workflow_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,13 @@
from concurrent.futures import Future
from typing import Any, Self

from ert.config import ErtScript, ExternalErtScript, Workflow, WorkflowJob
from ert.config.workflow_fixtures import WorkflowFixtures
from ert.config import (
ErtScript,
ExternalErtScript,
Workflow,
WorkflowFixtures,
WorkflowJob,
)


class WorkflowJobRunner:
Expand Down