From 059d94272d41bcbf97fbe9680a663301cd9339a1 Mon Sep 17 00:00:00 2001
From: Eivind Jahren <ejah@equinor.com>
Date: Wed, 23 Aug 2023 13:37:09 +0200
Subject: [PATCH] Move status_type_enum files

---
 src/ert/job_queue/__init__.py                             | 8 ++++----
 src/ert/job_queue/job_queue_manager.py                    | 2 +-
 src/ert/job_queue/job_queue_node.py                       | 6 +++---
 .../job_queue/{job_status_type_enum.py => job_status.py}  | 0
 src/ert/job_queue/queue.py                                | 4 ++--
 src/ert/job_queue/queue_differ.py                         | 2 +-
 .../job_queue/{run_status_type_enum.py => run_status.py}  | 0
 .../{job_submit_status_type_enum.py => submit_status.py}  | 0
 .../{thread_status_type_enum.py => thread_status.py}      | 0
 9 files changed, 11 insertions(+), 11 deletions(-)
 rename src/ert/job_queue/{job_status_type_enum.py => job_status.py} (100%)
 rename src/ert/job_queue/{run_status_type_enum.py => run_status.py} (100%)
 rename src/ert/job_queue/{job_submit_status_type_enum.py => submit_status.py} (100%)
 rename src/ert/job_queue/{thread_status_type_enum.py => thread_status.py} (100%)

diff --git a/src/ert/job_queue/__init__.py b/src/ert/job_queue/__init__.py
index d32fd64ab7c..e7cc6308b03 100644
--- a/src/ert/job_queue/__init__.py
+++ b/src/ert/job_queue/__init__.py
@@ -100,11 +100,11 @@ def root() -> str:
 from .driver import Driver  # noqa
 from .job_queue_manager import JobQueueManager  # noqa
 from .job_queue_node import JobQueueNode  # noqa
-from .job_status_type_enum import JobStatusType  # noqa
-from .job_submit_status_type_enum import JobSubmitStatusType  # noqa
+from .job_status import JobStatusType  # noqa
 from .queue import JobQueue  # noqa
-from .run_status_type_enum import RunStatusType  # noqa
-from .thread_status_type_enum import ThreadStatus  # noqa
+from .run_status import RunStatusType  # noqa
+from .submit_status import JobSubmitStatusType  # noqa
+from .thread_status import ThreadStatus  # noqa
 from .workflow_runner import WorkflowJobRunner, WorkflowRunner  # noqa
 
 __all__ = [
diff --git a/src/ert/job_queue/job_queue_manager.py b/src/ert/job_queue/job_queue_manager.py
index df424345158..35b7d58b78b 100644
--- a/src/ert/job_queue/job_queue_manager.py
+++ b/src/ert/job_queue/job_queue_manager.py
@@ -5,7 +5,7 @@
 from threading import BoundedSemaphore
 from typing import TYPE_CHECKING, Any
 
-from .job_status_type_enum import JobStatusType
+from .job_status import JobStatusType
 
 if TYPE_CHECKING:
     from .queue import JobQueue
diff --git a/src/ert/job_queue/job_queue_node.py b/src/ert/job_queue/job_queue_node.py
index df02cd91d75..6ca9ff08f82 100644
--- a/src/ert/job_queue/job_queue_node.py
+++ b/src/ert/job_queue/job_queue_node.py
@@ -23,9 +23,9 @@
 from ert.realization_state import RealizationState
 
 from . import ResPrototype
-from .job_status_type_enum import JobStatusType
-from .job_submit_status_type_enum import JobSubmitStatusType
-from .thread_status_type_enum import ThreadStatus
+from .job_status import JobStatusType
+from .submit_status import JobSubmitStatusType
+from .thread_status import ThreadStatus
 
 if TYPE_CHECKING:
     from multiprocessing.sharedctypes import Synchronized, SynchronizedString
diff --git a/src/ert/job_queue/job_status_type_enum.py b/src/ert/job_queue/job_status.py
similarity index 100%
rename from src/ert/job_queue/job_status_type_enum.py
rename to src/ert/job_queue/job_status.py
diff --git a/src/ert/job_queue/queue.py b/src/ert/job_queue/queue.py
index a7a5a033606..b61318de777 100644
--- a/src/ert/job_queue/queue.py
+++ b/src/ert/job_queue/queue.py
@@ -24,9 +24,9 @@
 import _ert_com_protocol
 from ert.constant_filenames import CERT_FILE, JOBS_FILE, ERROR_file, STATUS_file
 from ert.job_queue.job_queue_node import JobQueueNode
-from ert.job_queue.job_status_type_enum import JobStatusType
+from ert.job_queue.job_status import JobStatusType
 from ert.job_queue.queue_differ import QueueDiffer
-from ert.job_queue.thread_status_type_enum import ThreadStatus
+from ert.job_queue.thread_status import ThreadStatus
 
 from . import ResPrototype
 
diff --git a/src/ert/job_queue/queue_differ.py b/src/ert/job_queue/queue_differ.py
index b8b46585bf1..d7f15d9e1b7 100644
--- a/src/ert/job_queue/queue_differ.py
+++ b/src/ert/job_queue/queue_differ.py
@@ -3,7 +3,7 @@
 from typing import Dict, List, Tuple
 
 from .job_queue_node import JobQueueNode
-from .job_status_type_enum import JobStatusType
+from .job_status import JobStatusType
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/ert/job_queue/run_status_type_enum.py b/src/ert/job_queue/run_status.py
similarity index 100%
rename from src/ert/job_queue/run_status_type_enum.py
rename to src/ert/job_queue/run_status.py
diff --git a/src/ert/job_queue/job_submit_status_type_enum.py b/src/ert/job_queue/submit_status.py
similarity index 100%
rename from src/ert/job_queue/job_submit_status_type_enum.py
rename to src/ert/job_queue/submit_status.py
diff --git a/src/ert/job_queue/thread_status_type_enum.py b/src/ert/job_queue/thread_status.py
similarity index 100%
rename from src/ert/job_queue/thread_status_type_enum.py
rename to src/ert/job_queue/thread_status.py