Remove code paths for python <3.11

src/_ert/events.py

@@ -1,11 +1,5 @@
-import sys
 from datetime import datetime
-from typing import Any, Dict, Final, Literal, Union
-
-if sys.version_info < (3, 9):
-    from typing_extensions import Annotated
-else:
-    from typing import Annotated
+from typing import Annotated, Any, Dict, Final, Literal, Union
 
 from pydantic import BaseModel, ConfigDict, Field, TypeAdapter
 

src/ert/config/parsing/analysis_mode.py

@@ -1,4 +1,4 @@
-from ert.enum_shim import StrEnum
+from enum import StrEnum
 
 
 class AnalysisMode(StrEnum):

src/ert/config/parsing/config_keywords.py

@@ -1,4 +1,4 @@
-from ert.enum_shim import StrEnum
+from enum import StrEnum
 
 
 class ConfigKeys(StrEnum):

src/ert/config/parsing/config_schema_item.py

@@ -1,12 +1,11 @@
 import os
 import shutil
+from enum import EnumType
 from typing import List, Mapping, Optional, TypeVar, Union
 
 from pydantic import ConfigDict, Field, NonNegativeInt, PositiveInt
 from pydantic.dataclasses import dataclass
 
-from ert.enum_shim import EnumType
-
 from .config_errors import ConfigValidationError
 from .context_values import (
     ContextBool,

src/ert/config/parsing/forward_model_keywords.py

@@ -1,4 +1,4 @@
-from ert.enum_shim import StrEnum
+from enum import StrEnum
 
 
 class ForwardModelStepKeys(StrEnum):

src/ert/config/parsing/history_source.py

@@ -1,4 +1,4 @@
-from ert.enum_shim import StrEnum
+from enum import StrEnum
 
 
 class HistorySource(StrEnum):

src/ert/config/parsing/hook_runtime.py

@@ -1,4 +1,4 @@
-from ert.enum_shim import StrEnum
+from enum import StrEnum
 
 
 class HookRuntime(StrEnum):

src/ert/config/parsing/queue_system.py

@@ -1,4 +1,4 @@
-from ert.enum_shim import StrEnum
+from enum import StrEnum
 
 
 class QueueSystem(StrEnum):

src/ert/config/parsing/schema_item_type.py

@@ -1,4 +1,4 @@
-from ert.enum_shim import StrEnum
+from enum import StrEnum
 
 
 class SchemaItemType(StrEnum):

src/ert/config/parsing/workflow_job_keywords.py

@@ -1,4 +1,4 @@
-from ert.enum_shim import StrEnum
+from enum import StrEnum
 
 
 class WorkflowJobKeys(StrEnum):

src/ert/config/parsing/workflow_keywords.py

@@ -1,4 +1,4 @@
-from ert.enum_shim import StrEnum
+from enum import StrEnum
 
 
 class WorkflowKeys(StrEnum):

src/ert/dark_storage/json_schema/prior.py

@@ -1,13 +1,7 @@
-import sys
-from typing import Union
+from typing import Literal, Union
 
 from pydantic import BaseModel
 
-if sys.version_info < (3, 8):
-    from typing_extensions import Literal
-else:
-    from typing import Literal
-
 
 class PriorConst(BaseModel):
     """

src/ert/field_utils/field_file_format.py

@@ -1,4 +1,4 @@
-from ert.enum_shim import StrEnum
+from enum import StrEnum
 
 
 class FieldFileFormat(StrEnum):

src/ert/gui/main.py

@@ -2,17 +2,11 @@
 
 import logging
 import os
-import sys
+from collections import Counter
+from importlib.resources import files
 from signal import SIG_DFL, SIGINT, signal
 from typing import Optional, Tuple
 
-if sys.version_info >= (3, 9):
-    from importlib.resources import files
-else:
-    from importlib_resources import files
-
-from collections import Counter
-
 from qtpy.QtCore import QDir
 from qtpy.QtGui import QIcon
 from qtpy.QtWidgets import QApplication, QWidget

src/everest/docs/generate_docs_from_config_spec.py

@@ -37,12 +37,6 @@ def doc_description(self) -> str:
         )
 
     def clean_type(self) -> str:
-        if sys.version_info < (3, 10):
-            self.type = self.type.replace("Annotated[int, Ge(ge=0)]", "NonNegativeInt")
-            self.type = self.type.replace("Annotated[int, Gt(gt=0)]", "PositiveInt")
-            self.type = self.type.replace("Annotated[float, Gt(gt=0)]", "PositiveFloat")
-            self.type = re.sub(r"Union\[(.+),\s+NoneType\]", r"Optional[\1]", self.type)
-
         self.type = self.type.replace("Annotated[int, Ge]", "NonNegativeInt")
         self.type = self.type.replace("Annotated[int, Gt]", "PositiveInt")
         self.type = self.type.replace("Annotated[float, Gt]", "PositiveFloat")

src/everest/export.py

@@ -1,6 +1,6 @@
 import os
 import re
-import sys
+from enum import StrEnum
 from typing import Any, Dict, List, Optional, Set
 
 import pandas as pd
@@ -11,15 +11,6 @@
 from everest.config import ExportConfig
 from everest.strings import STORAGE_DIR
 
-if sys.version_info < (3, 11):
-    from enum import Enum
-
-    class StrEnum(str, Enum):
-        pass
-
-else:
-    from enum import StrEnum
-
 
 class MetaDataColumnNames(StrEnum):
     # NOTE: Always add a new column name to the list below!

tests/ert/conftest.py

@@ -6,24 +6,18 @@
 import shutil
 import sys
 from argparse import ArgumentParser
+from importlib.resources import files
 from pathlib import Path
 from unittest.mock import MagicMock
 
-from qtpy.QtWidgets import QApplication
-
-from _ert.threading import set_signal_handler
-
-if sys.version_info >= (3, 9):
-    from importlib.resources import files
-else:
-    from importlib_resources import files
-
 import pytest
 from hypothesis import HealthCheck, settings
 from hypothesis import strategies as st
 from qtpy.QtCore import QDir
+from qtpy.QtWidgets import QApplication
 
 import _ert.forward_model_runner.cli
+from _ert.threading import set_signal_handler
 from ert.__main__ import ert_parser
 from ert.cli.main import run_cli
 from ert.config import ErtConfig

tests/everest/entry_points/test_visualization_entry.py

@@ -1,9 +1,6 @@
-import sys
 from pathlib import Path
 from unittest.mock import patch
 
-import pytest
-
 from everest.bin.visualization_script import visualization_entry
 from everest.detached import ServerStatus
 from tests.everest.utils import capture_streams
@@ -13,7 +10,6 @@
     "everest.bin.visualization_script.everserver_status",
     return_value={"status": ServerStatus.completed},
 )
-@pytest.mark.skipif(sys.version_info.major < 3, reason="requires python3 or higher")
 def test_visualization_entry(_, cached_example):
     config_path, config_file, _ = cached_example("math_func/config_advanced.yml")
     with capture_streams() as (out, _):