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.

Sign up for GitHub

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

Small improvements here and there #6666

Merged
merged 4 commits into from
Nov 24, 2023
Merged

Small improvements here and there #6666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee7e78e
Remove unused forward_mock
xjules Nov 24, 2023
00faf37
Use the correct stop_long_running_realizations function
xjules Nov 24, 2023
e6a91f9
Type: ignore when calling queue.execute
xjules Nov 24, 2023
ba93527
Add types-lxml as type dependency
xjules Nov 24, 2023
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
1 change: 1 addition & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ types = [
"types-decorator",
"types-docutils",
"types-tqdm",
"types-lxml",
]

[tool.setuptools]
Expand Down
4 changes: 2 additions & 2 deletions src/ert/ensemble_evaluator/_builder/_legacy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
):
queue_evaluators = [
partial(
self._job_queue.stop_long_running_jobs,
self._job_queue.stop_long_running_realizations,
self._analysis_config.minimum_required_realizations,
)
]
Expand All @@ -207,8 +207,8 @@
self._job_queue.add_dispatch_information_to_jobs_file()

result: str = await self._job_queue.execute(
queue_evaluators,

Check failure on line 210 in src/ert/ensemble_evaluator/_builder/_legacy.py

View workflow job for this annotation

GitHub Actions / type-checking (3.11) 

Argument 1 to "execute" of "JobQueue" has incompatible type "list[partial[None]] | None"; expected "list[Callable[..., Any]] | None"
)
) # type: ignore

Check failure on line 211 in src/ert/ensemble_evaluator/_builder/_legacy.py

View workflow job for this annotation

GitHub Actions / type-checking (3.11) 

Unused "type: ignore" comment
print(result)
except Exception as exc:
print(exc)
Expand Down
1 change: 0 additions & 1 deletion tests/unit_tests/ensemble_evaluator/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ def queue_config_fixture():
@pytest.fixture
def make_ensemble_builder(queue_config):
def _make_ensemble_builder(monkeypatch, tmpdir, num_reals, num_jobs, job_sleep=0):
forward_mock = AsyncMock(return_value=(LoadStatus.LOAD_SUCCESSFUL, ""))
monkeypatch.setattr(
"ert.job_queue.queue.forward_model_ok",
AsyncMock(return_value=(LoadStatus.LOAD_SUCCESSFUL, "")),
Expand Down
Loading