diff --git a/ci/jenkins/testkomodo-libres-ctest.sh b/ci/jenkins/testkomodo-libres-ctest.sh index f813783528f..0cc10d223f4 100755 --- a/ci/jenkins/testkomodo-libres-ctest.sh +++ b/ci/jenkins/testkomodo-libres-ctest.sh @@ -7,7 +7,6 @@ build() { copy_test_files () { mkdir -p ${CI_TEST_ROOT}/src/clib/res/fm/rms - ln -s ${CI_SOURCE_ROOT}/src/clib/_c_wrappers/fm/rms/rms_config.yml ${CI_TEST_ROOT}/src/clib/res/fm/rms/rms_config.yml } install_test_dependencies () { diff --git a/script/pylint b/script/pylint index cc531c5bc25..702f67c247a 100755 --- a/script/pylint +++ b/script/pylint @@ -6,7 +6,6 @@ from typing import Union SOURCE_ROOT = Path(__file__).parent.parent IGNORE_PATHS = [ - "src/ert/_c_wrappers", "src/ert/gui", "src/ert/logging", "src/ert/analysis/_es_update.py", diff --git a/setup.py b/setup.py index e9fcaac6cf9..ec11feaa7a6 100644 --- a/setup.py +++ b/setup.py @@ -93,9 +93,6 @@ def package_files(directory): + package_files("src/ert/shared/share/") + ["logging/logger.conf", "logging/storage_log.conf"] + [ - "_c_wrappers/fm/rms/rms_config.yml", - "_c_wrappers/fm/ecl/ecl300_config.yml", - "_c_wrappers/fm/ecl/ecl100_config.yml", "job_queue/qstat_proxy.sh", ], }, diff --git a/src/ert/_c_wrappers/__init__.py b/src/ert/_c_wrappers/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/ert/_c_wrappers/enkf/__init__.py b/src/ert/_c_wrappers/enkf/__init__.py deleted file mode 100644 index f265c5f6a24..00000000000 --- a/src/ert/_c_wrappers/enkf/__init__.py +++ /dev/null @@ -1,11 +0,0 @@ -from .enkf_main import EnKFMain -from .ert_run_context import RunContext -from .row_scaling import RowScaling -from .run_arg import RunArg - -__all__ = [ - "RowScaling", - "RunArg", - "RunContext", - "EnKFMain", -] diff --git a/src/ert/_c_wrappers/util/__init__.py b/src/ert/_c_wrappers/util/__init__.py deleted file mode 100644 index fa65307e802..00000000000 --- a/src/ert/_c_wrappers/util/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -from .substitution_list import SubstitutionList - -__all__ = ["SubstitutionList"] diff --git a/src/ert/analysis/_es_update.py b/src/ert/analysis/_es_update.py index 53656c6c62a..4cd24dfbd85 100644 --- a/src/ert/analysis/_es_update.py +++ b/src/ert/analysis/_es_update.py @@ -25,17 +25,17 @@ ensemble_smoother_update_step_row_scaling, ) -from ert._c_wrappers.enkf.row_scaling import RowScaling from ert.config import Field, GenKwConfig, SurfaceConfig from ert.realization_state import RealizationState +from .row_scaling import RowScaling from .update import Parameter, RowScalingParameter if TYPE_CHECKING: import numpy.typing as npt - from ert._c_wrappers.enkf import EnKFMain from ert.config import AnalysisConfig, AnalysisModule, EnkfObs, EnsembleConfig + from ert.enkf_main import EnKFMain from ert.storage import EnsembleAccessor, EnsembleReader from .configuration import UpdateConfiguration diff --git a/src/ert/_c_wrappers/enkf/row_scaling.py b/src/ert/analysis/row_scaling.py similarity index 96% rename from src/ert/_c_wrappers/enkf/row_scaling.py rename to src/ert/analysis/row_scaling.py index 14b4a03919b..edf98ff2e5d 100644 --- a/src/ert/_c_wrappers/enkf/row_scaling.py +++ b/src/ert/analysis/row_scaling.py @@ -1,6 +1,6 @@ from typing import no_type_check -from ert._clib.local.row_scaling import RowScaling +from ert._clib.local.row_scaling import RowScaling # pylint: disable=import-error @no_type_check diff --git a/src/ert/analysis/update.py b/src/ert/analysis/update.py index a56fce4c041..56a6e5ccc4a 100644 --- a/src/ert/analysis/update.py +++ b/src/ert/analysis/update.py @@ -3,7 +3,7 @@ from pydantic import ConfigDict from pydantic.dataclasses import dataclass -from ert._c_wrappers.enkf.row_scaling import RowScaling +from .row_scaling import RowScaling @dataclass diff --git a/src/ert/callbacks.py b/src/ert/callbacks.py index f56a80d25ce..9586f020fe2 100644 --- a/src/ert/callbacks.py +++ b/src/ert/callbacks.py @@ -4,8 +4,8 @@ from pathlib import Path from typing import Callable, Iterable, Tuple -from ert._c_wrappers.enkf import RunArg from ert.config import EnsembleConfig, ParameterConfig, SummaryConfig +from ert.run_arg import RunArg from .load_status import LoadResult, LoadStatus from .realization_state import RealizationState diff --git a/src/ert/cli/main.py b/src/ert/cli/main.py index 48cf01c0ec9..f8198331623 100644 --- a/src/ert/cli/main.py +++ b/src/ert/cli/main.py @@ -8,7 +8,6 @@ import uuid from typing import Any -from ert._c_wrappers.enkf import EnKFMain from ert.cli import ( ENSEMBLE_EXPERIMENT_MODE, ENSEMBLE_SMOOTHER_MODE, @@ -21,6 +20,7 @@ from ert.cli.monitor import Monitor from ert.cli.workflow import execute_workflow from ert.config import ErtConfig +from ert.enkf_main import EnKFMain from ert.ensemble_evaluator import EvaluatorServerConfig, EvaluatorTracker from ert.libres_facade import LibresFacade from ert.shared.feature_toggling import FeatureToggling diff --git a/src/ert/cli/model_factory.py b/src/ert/cli/model_factory.py index 9909778bdb1..295130e03a0 100644 --- a/src/ert/cli/model_factory.py +++ b/src/ert/cli/model_factory.py @@ -5,7 +5,6 @@ from typing import TYPE_CHECKING, List from uuid import UUID -from ert._c_wrappers.enkf.enkf_main import EnKFMain from ert.cli import ( ENSEMBLE_EXPERIMENT_MODE, ENSEMBLE_SMOOTHER_MODE, @@ -14,6 +13,7 @@ TEST_RUN_MODE, ) from ert.config import ConfigWarning +from ert.enkf_main import EnKFMain from ert.run_models import ( EnsembleExperiment, EnsembleSmoother, diff --git a/src/ert/config/ert_config.py b/src/ert/config/ert_config.py index 50b99b416ac..f7b880836ee 100644 --- a/src/ert/config/ert_config.py +++ b/src/ert/config/ert_config.py @@ -10,7 +10,7 @@ import pkg_resources -from ert._c_wrappers.util import SubstitutionList +from ert.substitution_list import SubstitutionList from .analysis_config import AnalysisConfig from .ensemble_config import EnsembleConfig diff --git a/src/ert/config/ert_script.py b/src/ert/config/ert_script.py index 07b610e7ebc..e891e26a2bb 100644 --- a/src/ert/config/ert_script.py +++ b/src/ert/config/ert_script.py @@ -10,7 +10,7 @@ from typing import TYPE_CHECKING, Any, Callable, List, Optional, Type if TYPE_CHECKING: - from ert._c_wrappers.enkf import EnKFMain + from ert.enkf_main import EnKFMain from ert.storage import EnsembleAccessor, StorageAccessor logger = logging.getLogger(__name__) diff --git a/src/ert/config/ext_job.py b/src/ert/config/ext_job.py index 4d7c2c401a1..323e865482b 100644 --- a/src/ert/config/ext_job.py +++ b/src/ert/config/ext_job.py @@ -4,7 +4,7 @@ from dataclasses import dataclass, field from typing import Dict, List, Optional, Tuple, no_type_check -from ert._c_wrappers.util import SubstitutionList +from ert.substitution_list import SubstitutionList from .parse_arg_types_list import parse_arg_types_list from .parsing import ( diff --git a/src/ert/config/external_ert_script.py b/src/ert/config/external_ert_script.py index 417aea0b4d5..ef4a71250f8 100644 --- a/src/ert/config/external_ert_script.py +++ b/src/ert/config/external_ert_script.py @@ -8,7 +8,7 @@ from .ert_script import ErtScript if TYPE_CHECKING: - from ert._c_wrappers.enkf import EnKFMain + from ert.enkf_main import EnKFMain from ert.storage import StorageAccessor diff --git a/src/ert/config/workflow.py b/src/ert/config/workflow.py index 956cee7d3ca..16109d7a7da 100644 --- a/src/ert/config/workflow.py +++ b/src/ert/config/workflow.py @@ -6,7 +6,7 @@ from .parsing import ConfigValidationError, ErrorInfo, init_workflow_schema, lark_parse if TYPE_CHECKING: - from ert._c_wrappers.util import SubstitutionList + from ert.substitution_list import SubstitutionList from .workflow_job import WorkflowJob diff --git a/src/ert/dark_storage/enkf.py b/src/ert/dark_storage/enkf.py index 4632c7f92a4..41db9ae77dd 100644 --- a/src/ert/dark_storage/enkf.py +++ b/src/ert/dark_storage/enkf.py @@ -6,8 +6,8 @@ from ert_storage.security import security from fastapi import Depends -from ert._c_wrappers.enkf import EnKFMain from ert.config import ErtConfig +from ert.enkf_main import EnKFMain from ert.libres_facade import LibresFacade from ert.storage import StorageReader, open_storage diff --git a/src/ert/_c_wrappers/enkf/enkf_main.py b/src/ert/enkf_main.py similarity index 95% rename from src/ert/_c_wrappers/enkf/enkf_main.py rename to src/ert/enkf_main.py index 57d8316080f..f77c1e23dc1 100644 --- a/src/ert/_c_wrappers/enkf/enkf_main.py +++ b/src/ert/enkf_main.py @@ -21,23 +21,23 @@ import numpy as np from numpy.random import SeedSequence -from ert._c_wrappers.enkf.ert_run_context import RunContext -from ert._c_wrappers.util.substitution_list import SubstitutionList -from ert.analysis.configuration import UpdateConfiguration -from ert.config import ( +from .analysis.configuration import UpdateConfiguration +from .config import ( AnalysisConfig, EnkfObs, EnsembleConfig, ModelConfig, ParameterConfig, ) -from ert.job_queue import WorkflowRunner -from ert.realization_state import RealizationState -from ert.runpaths import Runpaths +from .job_queue import WorkflowRunner +from .realization_state import RealizationState +from .run_context import RunContext +from .runpaths import Runpaths +from .substitution_list import SubstitutionList if TYPE_CHECKING: - from ert.config import ErtConfig, HookRuntime, QueueConfig - from ert.storage import EnsembleAccessor, EnsembleReader, StorageAccessor + from .config import ErtConfig, HookRuntime, QueueConfig + from .storage import EnsembleAccessor, EnsembleReader, StorageAccessor logger = logging.getLogger(__name__) @@ -97,7 +97,7 @@ def _value_export_json( ) -def _generate_parameter_files( +def _generate_parameter_files( # pylint: disable=too-many-arguments parameter_configs: Iterable[ParameterConfig], export_base_name: str, run_path: Path, @@ -154,7 +154,7 @@ def _seed_sequence(seed: Optional[str]) -> SeedSequence: return SeedSequence(int_seed) -class EnKFMain: +class EnKFMain: # pylint: disable=too-many-public-methods def __init__(self, config: "ErtConfig", read_only: bool = False) -> None: self.ert_config = config self._update_configuration: Optional[UpdateConfiguration] = None diff --git a/src/ert/ensemble_evaluator/_builder/_ensemble_builder.py b/src/ert/ensemble_evaluator/_builder/_ensemble_builder.py index b3b6e855eed..482fee2abf4 100644 --- a/src/ert/ensemble_evaluator/_builder/_ensemble_builder.py +++ b/src/ert/ensemble_evaluator/_builder/_ensemble_builder.py @@ -10,8 +10,7 @@ from ._realization import RealizationBuilder if TYPE_CHECKING: - from ert._c_wrappers.enkf import AnalysisConfig - from ert.config import QueueConfig + from ert.config import AnalysisConfig, QueueConfig from ._ensemble import Ensemble diff --git a/src/ert/ensemble_evaluator/_builder/_legacy.py b/src/ert/ensemble_evaluator/_builder/_legacy.py index dfa6968dc76..2899a775d64 100644 --- a/src/ert/ensemble_evaluator/_builder/_legacy.py +++ b/src/ert/ensemble_evaluator/_builder/_legacy.py @@ -29,9 +29,9 @@ from ._ensemble import Ensemble if TYPE_CHECKING: - from ert._c_wrappers.enkf import AnalysisConfig, EnsembleConfig, RunArg from ert.callbacks import Callback - from ert.config import QueueConfig + from ert.config import AnalysisConfig, EnsembleConfig, QueueConfig + from ert.run_arg import RunArg from ..config import EvaluatorServerConfig from ._realization import Realization diff --git a/src/ert/ensemble_evaluator/_builder/_step.py b/src/ert/ensemble_evaluator/_builder/_step.py index 346ab4c86e1..4eae6437987 100644 --- a/src/ert/ensemble_evaluator/_builder/_step.py +++ b/src/ert/ensemble_evaluator/_builder/_step.py @@ -9,8 +9,8 @@ SOURCE_TEMPLATE_STEP = "/step/{step_id}" if TYPE_CHECKING: - from ert._c_wrappers.enkf import RunArg from ert.callbacks import Callback, CallbackArgs + from ert.run_arg import RunArg class Step(Stage): diff --git a/src/ert/gui/ertwidgets/models/ertsummary.py b/src/ert/gui/ertwidgets/models/ertsummary.py index 8a2c9d33186..ae1a819a5b4 100644 --- a/src/ert/gui/ertwidgets/models/ertsummary.py +++ b/src/ert/gui/ertwidgets/models/ertsummary.py @@ -1,7 +1,7 @@ from typing import List -from ert._c_wrappers.enkf import EnKFMain from ert.config import EnkfObservationImplementationType +from ert.enkf_main import EnKFMain class ErtSummary: diff --git a/src/ert/gui/ertwidgets/summarypanel.py b/src/ert/gui/ertwidgets/summarypanel.py index 49ab3d707e6..2f517a2bc3d 100644 --- a/src/ert/gui/ertwidgets/summarypanel.py +++ b/src/ert/gui/ertwidgets/summarypanel.py @@ -14,7 +14,7 @@ from ert.gui.ertwidgets.models.ertsummary import ErtSummary if TYPE_CHECKING: - from ert._c_wrappers.enkf import EnKFMain + from ert.enkf_main import EnKFMain class SummaryTemplate: diff --git a/src/ert/gui/main.py b/src/ert/gui/main.py index 5c34175e469..fba2cd502e9 100755 --- a/src/ert/gui/main.py +++ b/src/ert/gui/main.py @@ -18,8 +18,8 @@ from qtpy.QtCore import QLocale, QSize, Qt from qtpy.QtWidgets import QApplication -from ert._c_wrappers.enkf import EnKFMain from ert.config import ConfigValidationError, ConfigWarning, ErtConfig, ParameterConfig +from ert.enkf_main import EnKFMain from ert.gui.about_dialog import AboutDialog from ert.gui.ertwidgets import SuggestorMessage, SummaryPanel, resourceIcon from ert.gui.main_window import ErtMainWindow diff --git a/src/ert/gui/simulation/ensemble_experiment_panel.py b/src/ert/gui/simulation/ensemble_experiment_panel.py index 058e93d0327..2ae812a64b5 100644 --- a/src/ert/gui/simulation/ensemble_experiment_panel.py +++ b/src/ert/gui/simulation/ensemble_experiment_panel.py @@ -2,7 +2,7 @@ from qtpy.QtWidgets import QFormLayout, QLabel -from ert._c_wrappers.enkf import EnKFMain +from ert.enkf_main import EnKFMain from ert.gui.ertnotifier import ErtNotifier from ert.gui.ertwidgets import addHelpToWidget from ert.gui.ertwidgets.caseselector import CaseSelector diff --git a/src/ert/gui/simulation/ensemble_smoother_panel.py b/src/ert/gui/simulation/ensemble_smoother_panel.py index fc5c0a29017..b2038c6984f 100644 --- a/src/ert/gui/simulation/ensemble_smoother_panel.py +++ b/src/ert/gui/simulation/ensemble_smoother_panel.py @@ -2,7 +2,7 @@ from qtpy.QtWidgets import QFormLayout, QLabel -from ert._c_wrappers.enkf import EnKFMain +from ert.enkf_main import EnKFMain from ert.gui.ertnotifier import ErtNotifier from ert.gui.ertwidgets import AnalysisModuleEdit, addHelpToWidget from ert.gui.ertwidgets.caseselector import CaseSelector diff --git a/src/ert/gui/simulation/simulation_panel.py b/src/ert/gui/simulation/simulation_panel.py index adfb3d6fbbc..382f55d98c2 100644 --- a/src/ert/gui/simulation/simulation_panel.py +++ b/src/ert/gui/simulation/simulation_panel.py @@ -15,8 +15,8 @@ QWidget, ) -from ert._c_wrappers.enkf import EnKFMain from ert.cli.model_factory import create_model +from ert.enkf_main import EnKFMain from ert.gui.ertnotifier import ErtNotifier from ert.gui.ertwidgets import addHelpToWidget, resourceIcon from ert.libres_facade import LibresFacade diff --git a/src/ert/gui/tools/export/export_tool.py b/src/ert/gui/tools/export/export_tool.py index b34817e7ef0..1335f610b75 100644 --- a/src/ert/gui/tools/export/export_tool.py +++ b/src/ert/gui/tools/export/export_tool.py @@ -3,7 +3,7 @@ from qtpy.QtWidgets import QMessageBox -from ert._c_wrappers.enkf.enkf_main import EnKFMain +from ert.enkf_main import EnKFMain from ert.gui.ertnotifier import ErtNotifier from ert.gui.ertwidgets import resourceIcon from ert.gui.ertwidgets.closabledialog import ClosableDialog diff --git a/src/ert/gui/tools/plugins/plugin.py b/src/ert/gui/tools/plugins/plugin.py index f0ed0e22f96..a2cae15740b 100644 --- a/src/ert/gui/tools/plugins/plugin.py +++ b/src/ert/gui/tools/plugins/plugin.py @@ -5,9 +5,9 @@ if TYPE_CHECKING: from qtpy.QtWidgets import QWidget - from ert._c_wrappers.enkf import EnKFMain + from ert.config import ErtPlugin, WorkflowJob + from ert.enkf_main import EnKFMain from ert.gui.ertnotifier import ErtNotifier - from ert.job_queue import ErtPlugin, WorkflowJob class Plugin: diff --git a/src/ert/gui/tools/plugins/plugin_handler.py b/src/ert/gui/tools/plugins/plugin_handler.py index 10dafc65d27..21299f0dcf8 100644 --- a/src/ert/gui/tools/plugins/plugin_handler.py +++ b/src/ert/gui/tools/plugins/plugin_handler.py @@ -3,9 +3,9 @@ from .plugin import Plugin if TYPE_CHECKING: - from ert._c_wrappers.enkf import EnKFMain + from ert.config import WorkflowJob + from ert.enkf_main import EnKFMain from ert.gui.ertnotifier import ErtNotifier - from ert.job_queue import WorkflowJob class PluginHandler: diff --git a/src/ert/gui/tools/run_analysis/run_analysis_tool.py b/src/ert/gui/tools/run_analysis/run_analysis_tool.py index c5617db225a..fe90384b777 100644 --- a/src/ert/gui/tools/run_analysis/run_analysis_tool.py +++ b/src/ert/gui/tools/run_analysis/run_analysis_tool.py @@ -5,8 +5,8 @@ from qtpy.QtCore import QObject, Qt, QThread, Signal, Slot from qtpy.QtWidgets import QApplication, QMessageBox -from ert._c_wrappers.enkf import EnKFMain from ert.analysis import ErtAnalysisError, ESUpdate, Progress +from ert.enkf_main import EnKFMain from ert.gui.ertnotifier import ErtNotifier from ert.gui.ertwidgets import resourceIcon from ert.gui.ertwidgets.statusdialog import StatusDialog diff --git a/src/ert/job_queue/queue.py b/src/ert/job_queue/queue.py index 26f4f7f0a6d..a823b42f3c2 100644 --- a/src/ert/job_queue/queue.py +++ b/src/ert/job_queue/queue.py @@ -31,10 +31,10 @@ from . import ResPrototype if TYPE_CHECKING: - from ert._c_wrappers.enkf.run_arg import RunArg from ert.callbacks import Callback from ert.config import ErtConfig from ert.ensemble_evaluator import LegacyStep + from ert.run_arg import RunArg from .driver import Driver diff --git a/src/ert/job_queue/workflow_runner.py b/src/ert/job_queue/workflow_runner.py index ff9de46c76f..818c8db5e97 100644 --- a/src/ert/job_queue/workflow_runner.py +++ b/src/ert/job_queue/workflow_runner.py @@ -10,7 +10,7 @@ from ert.config import ErtScript, ExternalErtScript, Workflow, WorkflowJob if TYPE_CHECKING: - from ert._c_wrappers.enkf import EnKFMain + from ert.enkf_main import EnKFMain from ert.storage import EnsembleAccessor, StorageAccessor diff --git a/src/ert/libres_facade.py b/src/ert/libres_facade.py index 31ab6564a73..5aa34502f6c 100644 --- a/src/ert/libres_facade.py +++ b/src/ert/libres_facade.py @@ -10,9 +10,7 @@ from ecl.grid import EclGrid from pandas import DataFrame, Series -from ert._c_wrappers.enkf import EnKFMain -from ert.analysis import ESUpdate, SmootherSnapshot -from ert.analysis._es_update import ProgressCallback +from ert.analysis import ESUpdate, ProgressCallback, SmootherSnapshot from ert.config import ( EnkfObservationImplementationType, EnsembleConfig, @@ -27,6 +25,8 @@ from ert.shared.version import __version__ from ert.storage import EnsembleReader +from .enkf_main import EnKFMain + _logger = logging.getLogger(__name__) if TYPE_CHECKING: diff --git a/src/ert/logging/logger.conf b/src/ert/logging/logger.conf index 700acf0476a..f5347a83b6c 100644 --- a/src/ert/logging/logger.conf +++ b/src/ert/logging/logger.conf @@ -103,9 +103,6 @@ loggers: level: WARN handlers: [eefile] propagate: no - ert._c_wrappers: - level: INFO - propagate: yes ert.job_queue: level: DEBUG propagate: yes @@ -115,9 +112,18 @@ loggers: ert.config: level: DEBUG propagate: yes - ert._c_wrappers.enkf.enkf_main: + ert.enkf_main: level: DEBUG propagate: yes + ert.run_arg: + level: INFO + propagate: yes + ert.run_context: + level: INFO + propagate: yes + ert.substitution_list: + level: INFO + propagate: yes root: diff --git a/src/ert/_c_wrappers/enkf/run_arg.py b/src/ert/run_arg.py similarity index 94% rename from src/ert/_c_wrappers/enkf/run_arg.py rename to src/ert/run_arg.py index aa86c79920e..2c545bc0688 100644 --- a/src/ert/_c_wrappers/enkf/run_arg.py +++ b/src/ert/run_arg.py @@ -9,7 +9,7 @@ @dataclass -class RunArg: +class RunArg: # pylint: disable=too-many-instance-attributes run_id: str ensemble_storage: EnsembleAccessor iens: int diff --git a/src/ert/_c_wrappers/enkf/ert_run_context.py b/src/ert/run_context.py similarity index 93% rename from src/ert/_c_wrappers/enkf/ert_run_context.py rename to src/ert/run_context.py index 3c153ed27d1..c1d2c0e6215 100644 --- a/src/ert/_c_wrappers/enkf/ert_run_context.py +++ b/src/ert/run_context.py @@ -4,11 +4,11 @@ from dataclasses import dataclass, field from typing import TYPE_CHECKING, Iterator, List -from ert._c_wrappers.enkf.run_arg import RunArg -from ert.runpaths import Runpaths +from .run_arg import RunArg +from .runpaths import Runpaths if TYPE_CHECKING: - from ert.storage import EnsembleAccessor + from .storage import EnsembleAccessor @dataclass diff --git a/src/ert/run_models/base_run_model.py b/src/ert/run_models/base_run_model.py index 25deaa054ca..aade8b75c39 100644 --- a/src/ert/run_models/base_run_model.py +++ b/src/ert/run_models/base_run_model.py @@ -15,10 +15,9 @@ from cloudevents.http import CloudEvent import _ert_com_protocol -from ert._c_wrappers.enkf import EnKFMain -from ert._c_wrappers.enkf.ert_run_context import RunContext from ert.callbacks import forward_model_exit, forward_model_ok from ert.cli import MODULE_MODE +from ert.enkf_main import EnKFMain from ert.ensemble_evaluator import ( Ensemble, EnsembleBuilder, @@ -30,6 +29,7 @@ ) from ert.job_queue import RunStatusType from ert.libres_facade import LibresFacade +from ert.run_context import RunContext from ert.storage import StorageAccessor event_logger = logging.getLogger("ert.event_log") diff --git a/src/ert/run_models/ensemble_experiment.py b/src/ert/run_models/ensemble_experiment.py index 93276604caf..4cdc54231f1 100644 --- a/src/ert/run_models/ensemble_experiment.py +++ b/src/ert/run_models/ensemble_experiment.py @@ -7,17 +7,17 @@ from uuid import UUID import _ert_com_protocol -from ert._c_wrappers.enkf import RunContext from ert.config import HookRuntime from ert.ensemble_evaluator import EvaluatorServerConfig from ert.realization_state import RealizationState +from ert.run_context import RunContext from ert.storage import EnsembleAccessor, StorageAccessor from .base_run_model import BaseRunModel, ErtRunError if TYPE_CHECKING: - from ert._c_wrappers.enkf import EnKFMain from ert.config import QueueConfig + from ert.enkf_main import EnKFMain experiment_logger = logging.getLogger("ert.experiment_server.ensemble_experiment") diff --git a/src/ert/run_models/ensemble_smoother.py b/src/ert/run_models/ensemble_smoother.py index 65ce3bfbfdc..94e37941778 100644 --- a/src/ert/run_models/ensemble_smoother.py +++ b/src/ert/run_models/ensemble_smoother.py @@ -4,18 +4,18 @@ from typing import TYPE_CHECKING, Any, Dict from uuid import UUID -from ert._c_wrappers.enkf import RunContext from ert.analysis import ErtAnalysisError from ert.config import HookRuntime from ert.ensemble_evaluator import EvaluatorServerConfig from ert.realization_state import RealizationState +from ert.run_context import RunContext from ert.storage import StorageAccessor from .base_run_model import BaseRunModel, ErtRunError if TYPE_CHECKING: - from ert._c_wrappers.enkf import EnKFMain from ert.config import QueueConfig + from ert.enkf_main import EnKFMain experiment_logger = logging.getLogger("ert.experiment_server.ensemble_experiment") diff --git a/src/ert/run_models/iterated_ensemble_smoother.py b/src/ert/run_models/iterated_ensemble_smoother.py index 49d1879c466..4c4606208a3 100644 --- a/src/ert/run_models/iterated_ensemble_smoother.py +++ b/src/ert/run_models/iterated_ensemble_smoother.py @@ -6,18 +6,18 @@ from iterative_ensemble_smoother import SIES -from ert._c_wrappers.enkf import RunContext from ert.analysis import ErtAnalysisError from ert.config import AnalysisModule, HookRuntime from ert.ensemble_evaluator import EvaluatorServerConfig from ert.realization_state import RealizationState +from ert.run_context import RunContext from ert.storage import EnsembleAccessor, StorageAccessor from .base_run_model import BaseRunModel, ErtRunError if TYPE_CHECKING: - from ert._c_wrappers.enkf import EnKFMain from ert.config import QueueConfig + from ert.enkf_main import EnKFMain experiment_logger = logging.getLogger("ert.experiment_server.ensemble_experiment") diff --git a/src/ert/run_models/multiple_data_assimilation.py b/src/ert/run_models/multiple_data_assimilation.py index 44d144a9c7e..a70062b42b0 100644 --- a/src/ert/run_models/multiple_data_assimilation.py +++ b/src/ert/run_models/multiple_data_assimilation.py @@ -13,8 +13,9 @@ from .base_run_model import BaseRunModel, ErtRunError if TYPE_CHECKING: - from ert._c_wrappers.enkf import EnKFMain, RunContext from ert.config import QueueConfig + from ert.enkf_main import EnKFMain + from ert.run_context import RunContext logger = logging.getLogger(__file__) diff --git a/src/ert/run_models/single_test_run.py b/src/ert/run_models/single_test_run.py index 913412503b4..545a21facf3 100644 --- a/src/ert/run_models/single_test_run.py +++ b/src/ert/run_models/single_test_run.py @@ -6,9 +6,9 @@ from ert.run_models import EnsembleExperiment, ErtRunError if TYPE_CHECKING: - from ert._c_wrappers.enkf.enkf_main import EnKFMain - from ert._c_wrappers.enkf.ert_run_context import RunContext + from ert.enkf_main import EnKFMain from ert.ensemble_evaluator import EvaluatorServerConfig + from ert.run_context import RunContext from ert.storage import StorageAccessor diff --git a/src/ert/shared/exporter.py b/src/ert/shared/exporter.py index 560b0be8c3f..7e4d4e00209 100644 --- a/src/ert/shared/exporter.py +++ b/src/ert/shared/exporter.py @@ -1,6 +1,6 @@ import logging -from ert._c_wrappers.enkf.enkf_main import EnKFMain +from ert.enkf_main import EnKFMain from ert.gui.ertnotifier import ErtNotifier from ert.job_queue import WorkflowJobRunner from ert.libres_facade import LibresFacade diff --git a/src/ert/shared/share/ert/forward-models/res/script/ecl_run.py b/src/ert/shared/share/ert/forward-models/res/script/ecl_run.py index dc6b92c50f1..6b778b22854 100644 --- a/src/ert/shared/share/ert/forward-models/res/script/ecl_run.py +++ b/src/ert/shared/share/ert/forward-models/res/script/ecl_run.py @@ -177,7 +177,7 @@ class EclRun: #!/usr/bin/env python import sys - from ert._c_wrappers.fm.ecl import EclRun + from .ecl_run import EclRun run = EclRun() run.runEclipse( ) diff --git a/src/ert/simulator/batch_simulator.py b/src/ert/simulator/batch_simulator.py index 7ffa2daa7a1..0b11ef685c5 100644 --- a/src/ert/simulator/batch_simulator.py +++ b/src/ert/simulator/batch_simulator.py @@ -2,8 +2,8 @@ from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Tuple, Union -from ert._c_wrappers.enkf import EnKFMain from ert.config import ErtConfig, ExtParamConfig, GenDataConfig +from ert.enkf_main import EnKFMain from .batch_simulator_context import BatchContext diff --git a/src/ert/simulator/batch_simulator_context.py b/src/ert/simulator/batch_simulator_context.py index 99c90ff3733..b48cbae6272 100644 --- a/src/ert/simulator/batch_simulator_context.py +++ b/src/ert/simulator/batch_simulator_context.py @@ -14,7 +14,7 @@ import numpy.typing as npt - from ert._c_wrappers.enkf import EnKFMain + from ert.enkf_main import EnKFMain from ert.storage import EnsembleAccessor Status = namedtuple("Status", "waiting pending running complete failed") diff --git a/src/ert/simulator/simulation_context.py b/src/ert/simulator/simulation_context.py index a498bdd9d07..27cf6e44885 100644 --- a/src/ert/simulator/simulation_context.py +++ b/src/ert/simulator/simulation_context.py @@ -5,18 +5,19 @@ from time import sleep from typing import TYPE_CHECKING, Any, List, Optional, Tuple -from ert._c_wrappers.enkf import RunContext from ert.callbacks import forward_model_exit, forward_model_ok from ert.config import HookRuntime from ert.job_queue import Driver, JobQueue, JobQueueManager, RunStatusType from ert.realization_state import RealizationState +from ert.run_context import RunContext from ert.runpaths import Runpaths from .forward_model_status import ForwardModelStatus if TYPE_CHECKING: - from ert._c_wrappers.enkf import EnKFMain, RunArg + from ert.enkf_main import EnKFMain from ert.job_queue import JobStatusType + from ert.run_arg import RunArg from ert.storage import EnsembleAccessor diff --git a/src/ert/storage/local_ensemble.py b/src/ert/storage/local_ensemble.py index 1c579716430..280e81baf70 100644 --- a/src/ert/storage/local_ensemble.py +++ b/src/ert/storage/local_ensemble.py @@ -20,8 +20,8 @@ if TYPE_CHECKING: from ecl.summary import EclSum - from ert._c_wrappers.enkf.run_arg import RunArg from ert.config import EnsembleConfig + from ert.run_arg import RunArg from ert.storage.local_experiment import ( LocalExperimentAccessor, LocalExperimentReader, diff --git a/src/ert/_c_wrappers/util/substitution_list.py b/src/ert/substitution_list.py similarity index 100% rename from src/ert/_c_wrappers/util/substitution_list.py rename to src/ert/substitution_list.py diff --git a/tests/conftest.py b/tests/conftest.py index 7dfda87afde..7758a3522fe 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -10,10 +10,10 @@ from hypothesis import HealthCheck, settings from ert.__main__ import ert_parser -from ert._c_wrappers.enkf import EnKFMain from ert.cli import ENSEMBLE_EXPERIMENT_MODE from ert.cli.main import run_cli from ert.config import ErtConfig +from ert.enkf_main import EnKFMain from ert.services import StorageService from ert.shared.feature_toggling import FeatureToggling from ert.storage import open_storage diff --git a/tests/performance_tests/enkf/test_load_state.py b/tests/performance_tests/enkf/test_load_state.py index a180adb996f..974dbe0eee1 100644 --- a/tests/performance_tests/enkf/test_load_state.py +++ b/tests/performance_tests/enkf/test_load_state.py @@ -1,5 +1,5 @@ -from ert._c_wrappers.enkf import EnKFMain from ert.config import ErtConfig +from ert.enkf_main import EnKFMain from ert.storage import open_storage diff --git a/tests/performance_tests/test_dark_storage_performance.py b/tests/performance_tests/test_dark_storage_performance.py index 41bc9a8246c..3372cd1edf6 100644 --- a/tests/performance_tests/test_dark_storage_performance.py +++ b/tests/performance_tests/test_dark_storage_performance.py @@ -3,10 +3,10 @@ import pandas as pd import pytest -from ert._c_wrappers.enkf import EnKFMain from ert.async_utils import run_in_loop from ert.config import ErtConfig from ert.dark_storage.endpoints import ensembles, experiments, records, responses +from ert.enkf_main import EnKFMain from ert.libres_facade import LibresFacade from ert.storage import open_storage diff --git a/tests/performance_tests/test_memory_usage.py b/tests/performance_tests/test_memory_usage.py index 68115c0cbdd..f1e32e60277 100644 --- a/tests/performance_tests/test_memory_usage.py +++ b/tests/performance_tests/test_memory_usage.py @@ -10,9 +10,9 @@ import pytest import xarray as xr -from ert._c_wrappers.enkf import EnKFMain from ert.analysis import ESUpdate from ert.config import EnkfObservationImplementationType, ErtConfig, SummaryConfig +from ert.enkf_main import EnKFMain from ert.realization_state import RealizationState from ert.storage import EnsembleAccessor, EnsembleReader from ert.storage.local_ensemble import LocalEnsembleAccessor diff --git a/tests/unit_tests/all/plugins/test_export_runpath.py b/tests/unit_tests/all/plugins/test_export_runpath.py index c5c2c4202c7..11472ba547d 100644 --- a/tests/unit_tests/all/plugins/test_export_runpath.py +++ b/tests/unit_tests/all/plugins/test_export_runpath.py @@ -3,7 +3,7 @@ import pytest -from ert._c_wrappers.enkf import EnKFMain +from ert.enkf_main import EnKFMain from ert.runpaths import Runpaths from ert.shared.hook_implementations.workflows.export_runpath import ExportRunpathJob from ert.shared.plugins import ErtPluginManager diff --git a/tests/unit_tests/all/plugins/test_parameter_disable.py b/tests/unit_tests/all/plugins/test_parameter_disable.py index b98b7fec2a6..3584eba370f 100644 --- a/tests/unit_tests/all/plugins/test_parameter_disable.py +++ b/tests/unit_tests/all/plugins/test_parameter_disable.py @@ -2,8 +2,8 @@ import pytest -from ert._c_wrappers.enkf import EnKFMain from ert.config import ErtConfig +from ert.enkf_main import EnKFMain from ert.shared.hook_implementations.workflows.disable_parameters import ( DisableParametersUpdate, ) diff --git a/tests/unit_tests/analysis/test_es_update.py b/tests/unit_tests/analysis/test_es_update.py index 1f6c11d42c5..6d45b389a04 100644 --- a/tests/unit_tests/analysis/test_es_update.py +++ b/tests/unit_tests/analysis/test_es_update.py @@ -8,12 +8,12 @@ from ert import LibresFacade from ert.__main__ import ert_parser -from ert._c_wrappers.enkf import EnKFMain from ert.analysis import ErtAnalysisError, ESUpdate from ert.analysis._es_update import _create_temporary_parameter_storage from ert.cli import ENSEMBLE_EXPERIMENT_MODE, ENSEMBLE_SMOOTHER_MODE from ert.cli.main import run_cli from ert.config import ErtConfig +from ert.enkf_main import EnKFMain from ert.storage import open_storage diff --git a/tests/unit_tests/c_wrappers/integration/test_field_parameter.py b/tests/unit_tests/c_wrappers/integration/test_field_parameter.py index 1d3f00dff4b..55c3a8ba08a 100644 --- a/tests/unit_tests/c_wrappers/integration/test_field_parameter.py +++ b/tests/unit_tests/c_wrappers/integration/test_field_parameter.py @@ -18,10 +18,10 @@ from ecl.util.geometry import Surface from ert.__main__ import ert_parser -from ert._c_wrappers.enkf import EnKFMain from ert.cli import ENSEMBLE_SMOOTHER_MODE from ert.cli.main import run_cli from ert.config import ErtConfig, SummaryConfig +from ert.enkf_main import EnKFMain from ert.libres_facade import LibresFacade from ert.storage import EnsembleAccessor, open_storage diff --git a/tests/unit_tests/c_wrappers/integration/test_parameter_sample_types.py b/tests/unit_tests/c_wrappers/integration/test_parameter_sample_types.py index 9a61de3056f..ccaa3340342 100644 --- a/tests/unit_tests/c_wrappers/integration/test_parameter_sample_types.py +++ b/tests/unit_tests/c_wrappers/integration/test_parameter_sample_types.py @@ -15,10 +15,10 @@ from ecl.util.geometry import Surface from ert.__main__ import ert_parser -from ert._c_wrappers.enkf import EnKFMain from ert.cli import ENSEMBLE_SMOOTHER_MODE from ert.cli.main import run_cli from ert.config import ConfigValidationError, ErtConfig +from ert.enkf_main import EnKFMain from ert.libres_facade import LibresFacade from ert.storage import EnsembleAccessor, open_storage diff --git a/tests/unit_tests/c_wrappers/job_runner/test_jobmanager.py b/tests/unit_tests/c_wrappers/job_runner/test_jobmanager.py index bade47a633e..73420dd2c50 100644 --- a/tests/unit_tests/c_wrappers/job_runner/test_jobmanager.py +++ b/tests/unit_tests/c_wrappers/job_runner/test_jobmanager.py @@ -7,8 +7,8 @@ from _ert_job_runner.reporting.message import Exited, Start from _ert_job_runner.runner import JobRunner -from ert._c_wrappers.util import SubstitutionList from ert.config import ErtConfig, ExtJob +from ert.substitution_list import SubstitutionList # Test data generated by ForwardModel JSON_STRING = """ diff --git a/tests/unit_tests/c_wrappers/res/analysis/test_update_configuration.py b/tests/unit_tests/c_wrappers/res/analysis/test_update_configuration.py index 3279c79df56..95b12dfab85 100644 --- a/tests/unit_tests/c_wrappers/res/analysis/test_update_configuration.py +++ b/tests/unit_tests/c_wrappers/res/analysis/test_update_configuration.py @@ -1,8 +1,8 @@ import pytest from pydantic import ValidationError -from ert._c_wrappers.enkf.row_scaling import RowScaling from ert.analysis import UpdateConfiguration +from ert.analysis.row_scaling import RowScaling def test_configuration(): diff --git a/tests/unit_tests/c_wrappers/res/enkf/conftest.py b/tests/unit_tests/c_wrappers/res/enkf/conftest.py index 456cd8d5885..90e54233086 100644 --- a/tests/unit_tests/c_wrappers/res/enkf/conftest.py +++ b/tests/unit_tests/c_wrappers/res/enkf/conftest.py @@ -1,6 +1,6 @@ import pytest -from ert._c_wrappers.enkf import EnKFMain +from ert.enkf_main import EnKFMain @pytest.fixture() diff --git a/tests/unit_tests/c_wrappers/res/enkf/test_enkf_main.py b/tests/unit_tests/c_wrappers/res/enkf/test_enkf_main.py index fbb63bf41cd..7137caddc66 100644 --- a/tests/unit_tests/c_wrappers/res/enkf/test_enkf_main.py +++ b/tests/unit_tests/c_wrappers/res/enkf/test_enkf_main.py @@ -5,8 +5,8 @@ import pytest from ecl.summary import EclSum -from ert._c_wrappers.enkf import EnKFMain from ert.config import AnalysisConfig, EnsembleConfig, ErtConfig, ModelConfig +from ert.enkf_main import EnKFMain @pytest.mark.unstable diff --git a/tests/unit_tests/c_wrappers/res/enkf/test_enkf_runpath.py b/tests/unit_tests/c_wrappers/res/enkf/test_enkf_runpath.py index 3ba733446df..2f9673085d5 100755 --- a/tests/unit_tests/c_wrappers/res/enkf/test_enkf_runpath.py +++ b/tests/unit_tests/c_wrappers/res/enkf/test_enkf_runpath.py @@ -4,8 +4,8 @@ import pytest -from ert._c_wrappers.enkf.enkf_main import EnKFMain from ert.config import ErtConfig +from ert.enkf_main import EnKFMain def test_with_gen_kw(copy_case, storage): diff --git a/tests/unit_tests/c_wrappers/res/enkf/test_ert_run_context.py b/tests/unit_tests/c_wrappers/res/enkf/test_ert_run_context.py index be7d1f818eb..3c4de391f81 100644 --- a/tests/unit_tests/c_wrappers/res/enkf/test_ert_run_context.py +++ b/tests/unit_tests/c_wrappers/res/enkf/test_ert_run_context.py @@ -2,7 +2,7 @@ import pytest -from ert._c_wrappers.enkf import RunContext +from ert.run_context import RunContext from ert.runpaths import Runpaths diff --git a/tests/unit_tests/c_wrappers/res/enkf/test_load_forward_model.py b/tests/unit_tests/c_wrappers/res/enkf/test_load_forward_model.py index 069d1199f00..8bb9510bdf8 100644 --- a/tests/unit_tests/c_wrappers/res/enkf/test_load_forward_model.py +++ b/tests/unit_tests/c_wrappers/res/enkf/test_load_forward_model.py @@ -8,8 +8,8 @@ import pytest from ecl.summary import EclSum -from ert._c_wrappers.enkf import EnKFMain from ert.config import ErtConfig +from ert.enkf_main import EnKFMain from ert.libres_facade import LibresFacade from ert.realization_state import RealizationState from ert.storage import open_storage diff --git a/tests/unit_tests/c_wrappers/res/enkf/test_row_scaling.py b/tests/unit_tests/c_wrappers/res/enkf/test_row_scaling.py index 2effd98e977..7ea4fe84ee3 100644 --- a/tests/unit_tests/c_wrappers/res/enkf/test_row_scaling.py +++ b/tests/unit_tests/c_wrappers/res/enkf/test_row_scaling.py @@ -8,7 +8,7 @@ ensemble_smoother_update_step_row_scaling, ) -from ert._c_wrappers.enkf.row_scaling import RowScaling +from ert.analysis.row_scaling import RowScaling def row_scaling_coloumb(nx, ny, data_index): diff --git a/tests/unit_tests/c_wrappers/res/enkf/test_row_scaling_increased_belief_case.py b/tests/unit_tests/c_wrappers/res/enkf/test_row_scaling_increased_belief_case.py index 9d5ae33566f..105f34faa9d 100644 --- a/tests/unit_tests/c_wrappers/res/enkf/test_row_scaling_increased_belief_case.py +++ b/tests/unit_tests/c_wrappers/res/enkf/test_row_scaling_increased_belief_case.py @@ -4,7 +4,7 @@ ensemble_smoother_update_step_row_scaling, ) -from ert._c_wrappers.enkf.row_scaling import RowScaling +from ert.analysis.row_scaling import RowScaling # We fix the random seed in the tests to ensure no flakiness diff --git a/tests/unit_tests/c_wrappers/res/enkf/test_run_path_creation.py b/tests/unit_tests/c_wrappers/res/enkf/test_run_path_creation.py index 8d35c6c5664..cf5ff9e9559 100644 --- a/tests/unit_tests/c_wrappers/res/enkf/test_run_path_creation.py +++ b/tests/unit_tests/c_wrappers/res/enkf/test_run_path_creation.py @@ -5,8 +5,9 @@ import pytest -from ert._c_wrappers.enkf import EnKFMain, RunContext from ert.config import ErtConfig +from ert.enkf_main import EnKFMain +from ert.run_context import RunContext from ert.runpaths import Runpaths diff --git a/tests/unit_tests/c_wrappers/res/enkf/test_summary_response.py b/tests/unit_tests/c_wrappers/res/enkf/test_summary_response.py index a5df5a00bb6..451bf2c346b 100644 --- a/tests/unit_tests/c_wrappers/res/enkf/test_summary_response.py +++ b/tests/unit_tests/c_wrappers/res/enkf/test_summary_response.py @@ -4,8 +4,8 @@ from textwrap import dedent from ert import LibresFacade -from ert._c_wrappers.enkf import EnKFMain from ert.config import ErtConfig +from ert.enkf_main import EnKFMain def test_load_summary_response_restart_not_zero(tmpdir, snapshot, request, storage): diff --git a/tests/unit_tests/c_wrappers/res/util/test_substitution_list.py b/tests/unit_tests/c_wrappers/res/util/test_substitution_list.py index ce3b23f1866..1b560280fca 100644 --- a/tests/unit_tests/c_wrappers/res/util/test_substitution_list.py +++ b/tests/unit_tests/c_wrappers/res/util/test_substitution_list.py @@ -1,6 +1,6 @@ import pytest -from ert._c_wrappers.util.substitution_list import SubstitutionList +from ert.substitution_list import SubstitutionList def test_substitution_list(): diff --git a/tests/unit_tests/c_wrappers/test_integration_config.py b/tests/unit_tests/c_wrappers/test_integration_config.py index 8b27daca315..b968803cf7d 100644 --- a/tests/unit_tests/c_wrappers/test_integration_config.py +++ b/tests/unit_tests/c_wrappers/test_integration_config.py @@ -6,11 +6,11 @@ import pytest from ert.__main__ import ert_parser -from ert._c_wrappers.enkf import RunContext -from ert._c_wrappers.enkf.enkf_main import EnKFMain from ert.cli import TEST_RUN_MODE from ert.cli.main import run_cli from ert.config import ErtConfig +from ert.enkf_main import EnKFMain +from ert.run_context import RunContext from ert.storage import StorageAccessor diff --git a/tests/unit_tests/cli/test_cli_workflow.py b/tests/unit_tests/cli/test_cli_workflow.py index 72fb6cc4dc1..ec16f0d23a3 100644 --- a/tests/unit_tests/cli/test_cli_workflow.py +++ b/tests/unit_tests/cli/test_cli_workflow.py @@ -3,9 +3,9 @@ import pytest -from ert._c_wrappers.enkf import EnKFMain from ert.cli.workflow import execute_workflow from ert.config import ErtConfig +from ert.enkf_main import EnKFMain from ert.shared.plugins.plugin_manager import ErtPluginContext diff --git a/tests/unit_tests/cli/test_integration_cli.py b/tests/unit_tests/cli/test_integration_cli.py index cb564d19692..b20074e13b3 100644 --- a/tests/unit_tests/cli/test_integration_cli.py +++ b/tests/unit_tests/cli/test_integration_cli.py @@ -16,7 +16,6 @@ import ert.shared from ert import LibresFacade, ensemble_evaluator from ert.__main__ import ert_parser -from ert._c_wrappers.enkf import EnKFMain from ert.cli import ( ENSEMBLE_EXPERIMENT_MODE, ENSEMBLE_SMOOTHER_MODE, @@ -26,6 +25,7 @@ ) from ert.cli.main import ErtCliError, run_cli from ert.config import ConfigValidationError, ConfigWarning, ErtConfig +from ert.enkf_main import EnKFMain from ert.shared.feature_toggling import FeatureToggling from ert.storage import open_storage diff --git a/tests/unit_tests/config/test_defines.py b/tests/unit_tests/config/test_defines.py index e0f763a0a9f..ed971e06fe6 100644 --- a/tests/unit_tests/config/test_defines.py +++ b/tests/unit_tests/config/test_defines.py @@ -1,7 +1,7 @@ import pytest -from ert._c_wrappers.enkf import EnKFMain from ert.config import ErtConfig +from ert.enkf_main import EnKFMain from ert.storage import open_storage diff --git a/tests/unit_tests/config/test_forward_model_data_to_json.py b/tests/unit_tests/config/test_forward_model_data_to_json.py index 3692acd9867..e4f1a38802c 100644 --- a/tests/unit_tests/config/test_forward_model_data_to_json.py +++ b/tests/unit_tests/config/test_forward_model_data_to_json.py @@ -10,10 +10,10 @@ import pytest -from ert._c_wrappers.util import SubstitutionList from ert.config import ErtConfig, ExtJob from ert.constant_filenames import JOBS_FILE from ert.simulator.forward_model_status import ForwardModelStatus +from ert.substitution_list import SubstitutionList joblist = [ { diff --git a/tests/unit_tests/config/test_gen_kw_config.py b/tests/unit_tests/config/test_gen_kw_config.py index 47916bc92d3..a3e33a7fa39 100644 --- a/tests/unit_tests/config/test_gen_kw_config.py +++ b/tests/unit_tests/config/test_gen_kw_config.py @@ -5,8 +5,8 @@ import pytest -from ert._c_wrappers.enkf import EnKFMain from ert.config import ConfigValidationError, ErtConfig, GenKwConfig +from ert.enkf_main import EnKFMain @pytest.mark.usefixtures("use_tmpdir") diff --git a/tests/unit_tests/config/test_num_cpu.py b/tests/unit_tests/config/test_num_cpu.py index bf90e9fbb9f..1d15bba9240 100644 --- a/tests/unit_tests/config/test_num_cpu.py +++ b/tests/unit_tests/config/test_num_cpu.py @@ -2,9 +2,9 @@ import pytest -from ert._c_wrappers.enkf import EnKFMain from ert.config import ErtConfig from ert.config.parsing import ConfigKeys +from ert.enkf_main import EnKFMain @pytest.mark.usefixtures("use_tmpdir") diff --git a/tests/unit_tests/gui/conftest.py b/tests/unit_tests/gui/conftest.py index eb831ae99b3..27be319d2dd 100644 --- a/tests/unit_tests/gui/conftest.py +++ b/tests/unit_tests/gui/conftest.py @@ -15,8 +15,8 @@ from qtpy.QtCore import Qt, QTimer from qtpy.QtWidgets import QComboBox, QMessageBox, QWidget -from ert._c_wrappers.enkf import EnKFMain from ert.config import ErtConfig +from ert.enkf_main import EnKFMain from ert.ensemble_evaluator.identifiers import CURRENT_MEMORY_USAGE, MAX_MEMORY_USAGE from ert.ensemble_evaluator.snapshot import ( Job, diff --git a/tests/unit_tests/gui/run_analysis/test_run_analysis.py b/tests/unit_tests/gui/run_analysis/test_run_analysis.py index 46636eb0b04..c14b7db503a 100644 --- a/tests/unit_tests/gui/run_analysis/test_run_analysis.py +++ b/tests/unit_tests/gui/run_analysis/test_run_analysis.py @@ -4,8 +4,8 @@ from qtpy.QtCore import QThread from qtpy.QtGui import QIcon -from ert._c_wrappers.enkf import EnKFMain from ert.analysis import ErtAnalysisError, ESUpdate +from ert.enkf_main import EnKFMain from ert.gui.ertnotifier import ErtNotifier from ert.gui.ertwidgets.statusdialog import StatusDialog from ert.gui.tools.run_analysis import Analyse, RunAnalysisPanel, RunAnalysisTool diff --git a/tests/unit_tests/gui/simulation/test_run_dialog.py b/tests/unit_tests/gui/simulation/test_run_dialog.py index 51d5b2b06a4..8ca73e4032b 100644 --- a/tests/unit_tests/gui/simulation/test_run_dialog.py +++ b/tests/unit_tests/gui/simulation/test_run_dialog.py @@ -7,8 +7,8 @@ from qtpy.QtCore import Qt, QTimer from qtpy.QtWidgets import QMessageBox, QToolButton -from ert._c_wrappers.enkf import EnKFMain from ert.config import ErtConfig +from ert.enkf_main import EnKFMain from ert.ensemble_evaluator import identifiers as ids from ert.ensemble_evaluator import state from ert.ensemble_evaluator.event import ( diff --git a/tests/unit_tests/gui/test_gui_load.py b/tests/unit_tests/gui/test_gui_load.py index a13fbf111ce..03e9e90b943 100644 --- a/tests/unit_tests/gui/test_gui_load.py +++ b/tests/unit_tests/gui/test_gui_load.py @@ -9,8 +9,8 @@ from qtpy.QtWidgets import QComboBox, QMessageBox, QToolButton, QWidget import ert.gui -from ert._c_wrappers.enkf import EnKFMain from ert.config import ErtConfig +from ert.enkf_main import EnKFMain from ert.gui.about_dialog import AboutDialog from ert.gui.ertwidgets import SuggestorMessage from ert.gui.main import GUILogHandler, _setup_main_window, run_gui diff --git a/tests/unit_tests/gui/tools/test_case_tool.py b/tests/unit_tests/gui/tools/test_case_tool.py index 899692e0908..b820183f83f 100644 --- a/tests/unit_tests/gui/tools/test_case_tool.py +++ b/tests/unit_tests/gui/tools/test_case_tool.py @@ -2,8 +2,8 @@ from qtpy.QtCore import Qt from qtpy.QtWidgets import QPushButton, QTextEdit -from ert._c_wrappers.enkf import EnKFMain from ert.config import ErtConfig +from ert.enkf_main import EnKFMain from ert.gui.ertnotifier import ErtNotifier from ert.gui.tools.manage_cases.case_init_configuration import ( CaseInitializationConfigurationPanel, diff --git a/tests/unit_tests/job_queue/test_ert_script.py b/tests/unit_tests/job_queue/test_ert_script.py index 3b165362280..0e837bc0a38 100644 --- a/tests/unit_tests/job_queue/test_ert_script.py +++ b/tests/unit_tests/job_queue/test_ert_script.py @@ -42,13 +42,13 @@ def test_ert_script_from_file(): WorkflowCommon.createErtScriptsJob() with open("syntax_error_script.py", "w", encoding="utf-8") as f: - f.write("from ert._c_wrappers.enkf not_legal_syntax ErtScript\n") + f.write("from ert not_legal_syntax ErtScript\n") with open("import_error_script.py", "w", encoding="utf-8") as f: - f.write("from ert._c_wrappers.enkf import DoesNotExist\n") + f.write("from ert import DoesNotExist\n") with open("empty_script.py", "w", encoding="utf-8") as f: - f.write("from ert._c_wrappers.enkf import ErtScript\n") + f.write("from ert import ErtScript\n") script_object = ErtScript.loadScriptFromFile("subtract_script.py") diff --git a/tests/unit_tests/job_queue/test_workflow.py b/tests/unit_tests/job_queue/test_workflow.py index f7c60b8332e..ca04f33422b 100644 --- a/tests/unit_tests/job_queue/test_workflow.py +++ b/tests/unit_tests/job_queue/test_workflow.py @@ -3,9 +3,9 @@ import pytest from hypothesis import given, strategies -from ert._c_wrappers.util.substitution_list import SubstitutionList from ert.config import ConfigValidationError, Workflow, WorkflowJob from ert.job_queue import WorkflowRunner +from ert.substitution_list import SubstitutionList from .workflow_common import WorkflowCommon diff --git a/tests/unit_tests/job_queue/test_workflow_runner.py b/tests/unit_tests/job_queue/test_workflow_runner.py index 57bc657ad1e..fff6d5e1adc 100644 --- a/tests/unit_tests/job_queue/test_workflow_runner.py +++ b/tests/unit_tests/job_queue/test_workflow_runner.py @@ -3,9 +3,9 @@ import pytest -from ert._c_wrappers.util.substitution_list import SubstitutionList from ert.config import Workflow, WorkflowJob from ert.job_queue import WorkflowRunner +from ert.substitution_list import SubstitutionList from tests.utils import wait_until from .workflow_common import WorkflowCommon diff --git a/tests/unit_tests/scenarios/test_summary_response.py b/tests/unit_tests/scenarios/test_summary_response.py index 5403b25a997..f13024dd7a2 100644 --- a/tests/unit_tests/scenarios/test_summary_response.py +++ b/tests/unit_tests/scenarios/test_summary_response.py @@ -9,9 +9,9 @@ from ecl.summary import EclSum from ert import LibresFacade -from ert._c_wrappers.enkf import EnKFMain from ert.analysis import ErtAnalysisError, ESUpdate from ert.config import ErtConfig +from ert.enkf_main import EnKFMain @pytest.fixture diff --git a/tests/unit_tests/simulator/test_simulation_context.py b/tests/unit_tests/simulator/test_simulation_context.py index 4ddc10fa6d4..1b390a4c1ca 100644 --- a/tests/unit_tests/simulator/test_simulation_context.py +++ b/tests/unit_tests/simulator/test_simulation_context.py @@ -1,4 +1,4 @@ -from ert._c_wrappers.enkf import EnKFMain +from ert.enkf_main import EnKFMain from ert.realization_state import RealizationState from ert.simulator import SimulationContext from tests.utils import wait_until diff --git a/tests/unit_tests/status/test_tracking_integration.py b/tests/unit_tests/status/test_tracking_integration.py index 8d9933d8bf3..6aab1254fad 100644 --- a/tests/unit_tests/status/test_tracking_integration.py +++ b/tests/unit_tests/status/test_tracking_integration.py @@ -14,10 +14,10 @@ from jsonpath_ng import parse from ert.__main__ import ert_parser -from ert._c_wrappers.enkf.enkf_main import EnKFMain from ert.cli import ENSEMBLE_EXPERIMENT_MODE, ENSEMBLE_SMOOTHER_MODE, TEST_RUN_MODE from ert.cli.model_factory import create_model from ert.config import ErtConfig +from ert.enkf_main import EnKFMain from ert.ensemble_evaluator import EvaluatorTracker from ert.ensemble_evaluator.config import EvaluatorServerConfig from ert.ensemble_evaluator.event import ( diff --git a/tests/unit_tests/test_libres_facade.py b/tests/unit_tests/test_libres_facade.py index cf12d9ded03..b8e32985288 100644 --- a/tests/unit_tests/test_libres_facade.py +++ b/tests/unit_tests/test_libres_facade.py @@ -7,8 +7,8 @@ from ecl.summary import EclSum from pandas.core.base import PandasObject -from ert._c_wrappers.enkf import EnKFMain from ert.config import ErtConfig +from ert.enkf_main import EnKFMain from ert.libres_facade import LibresFacade from ert.storage import open_storage diff --git a/tests/unit_tests/test_runpaths.py b/tests/unit_tests/test_runpaths.py index 52bb06b6d4b..891d8d3438d 100644 --- a/tests/unit_tests/test_runpaths.py +++ b/tests/unit_tests/test_runpaths.py @@ -1,7 +1,7 @@ import pytest -from ert._c_wrappers.util.substitution_list import SubstitutionList from ert.runpaths import Runpaths +from ert.substitution_list import SubstitutionList @pytest.mark.parametrize(