From 6e9c8d06922425601d607582ba9e18138d132f9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Eide?= Date: Fri, 10 Jan 2025 09:59:14 +0100 Subject: [PATCH] Style fixes --- src/everest/config/everest_config.py | 2 +- tests/ert/unit_tests/config/test_queue_config.py | 1 + tests/everest/test_config_validation.py | 2 +- tests/everest/test_detached.py | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/everest/config/everest_config.py b/src/everest/config/everest_config.py index f2381129192..0a21bae1ac6 100644 --- a/src/everest/config/everest_config.py +++ b/src/everest/config/everest_config.py @@ -1,8 +1,8 @@ import logging import os from argparse import ArgumentParser -from functools import cached_property from copy import copy +from functools import cached_property from io import StringIO from itertools import chain from pathlib import Path diff --git a/tests/ert/unit_tests/config/test_queue_config.py b/tests/ert/unit_tests/config/test_queue_config.py index de06796a402..73c1d2dc3f5 100644 --- a/tests/ert/unit_tests/config/test_queue_config.py +++ b/tests/ert/unit_tests/config/test_queue_config.py @@ -15,6 +15,7 @@ from ert.config.queue_config import ( LocalQueueOptions, LsfQueueOptions, + QueueOptions, SlurmQueueOptions, TorqueQueueOptions, ) diff --git a/tests/everest/test_config_validation.py b/tests/everest/test_config_validation.py index 628d3ddf879..a44c6f4243e 100644 --- a/tests/everest/test_config_validation.py +++ b/tests/everest/test_config_validation.py @@ -146,7 +146,7 @@ def test_that_max_runtime_errors_only_on_negative(): def test_that_invalid_queue_system_errors(): with pytest.raises( - ValueError, match="does not match .*'local',.*'lsf',.*'slurm', .*'torque'" + ValueError, match=r"does not match .*'local',.*'lsf',.*'slurm', .*'torque'" ): EverestConfig.with_defaults(simulator={"queue_system": {"name": "docal"}}) diff --git a/tests/everest/test_detached.py b/tests/everest/test_detached.py index 3a80e1a2d84..921cb22a835 100644 --- a/tests/everest/test_detached.py +++ b/tests/everest/test_detached.py @@ -12,7 +12,6 @@ LsfQueueOptions, SlurmQueueOptions, TorqueQueueOptions, - activate_script, ) from ert.scheduler.event import FinishedEvent from everest.config import EverestConfig, InstallJobConfig