Restructure imports with ruff

.pre-commit-config.yaml

@@ -12,15 +12,15 @@ repos:
   - id: mixed-line-ending
   - id: trailing-whitespace
 
+-   repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.3.2
+    hooks:
+    - id: ruff
+      args: [ --extend-select, I, --fix ]
+
 - repo: https://github.com/psf/black
   rev: 23.11.0
   hooks:
   - id: black
 
--   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.7
-    hooks:
-    - id: ruff
-      args: [ --fix ]
-
 exclude: "tests/data/testensemble-reek001"

docs/conf.py

@@ -12,8 +12,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
 import os
+import sys
 
 # If extensions (or modules to document with autodoc) are in another
 # directory, add these directories to sys.path here. If the directory is

setup.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 """The setup script."""
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
 
 with open("README.rst") as readme_file:
     readme = readme_file.read()

src/fmu/ensemble/ensemble.py

@@ -1,26 +1,25 @@
 """Module containing the ScratchEnsemble class"""
 
-import re
-import os
 import glob
 import logging
+import os
+import re
 import warnings
 
 import dateutil
-import pandas as pd
 import numpy as np
+import pandas as pd
 import yaml
 from resdata import ResDataType
 from resdata.resfile import ResdataKW
 
-from .etc import Interaction  # noqa
-from .realization import ScratchRealization
-from .virtualrealization import VirtualRealization
-from .virtualensemble import VirtualEnsemble
 from .ensemblecombination import EnsembleCombination
-from .realization import parse_number
+from .etc import Interaction  # noqa
+from .realization import ScratchRealization, parse_number
 from .util import shortcut2path
 from .util.dates import unionize_smry_dates
+from .virtualensemble import VirtualEnsemble
+from .virtualrealization import VirtualRealization
 
 logger = logging.getLogger(__name__)
 

src/fmu/ensemble/ensembleset.py

@@ -1,9 +1,9 @@
 """Module for book-keeping and aggregation of ensembles"""
 
-import re
-import os
 import glob
 import logging
+import os
+import re
 import warnings
 
 import numpy as np

src/fmu/ensemble/etc.py

@@ -1,11 +1,11 @@
 """This module is deprecated and will be removed in fmu-ensemble v2.0.0"""
 
-import os
-import sys
-import warnings
 import inspect
 import logging
+import os
+import sys
 import timeit
+import warnings
 
 # pylint: disable=protected-access
 

src/fmu/ensemble/observations.py

@@ -2,23 +2,23 @@
 Observations support and related calculations
 """
 
-import os
-import math
 import datetime
-from collections import OrderedDict
 import logging
+import math
+import os
+from collections import OrderedDict
 
-import yaml
-import pandas as pd
 import dateutil
+import pandas as pd
+import yaml
 
-from .realization import ScratchRealization
 from .ensemble import ScratchEnsemble
-from .ensembleset import EnsembleSet
 from .ensemblecombination import EnsembleCombination
+from .ensembleset import EnsembleSet
+from .realization import ScratchRealization
 from .realizationcombination import RealizationCombination
-from .virtualrealization import VirtualRealization
 from .virtualensemble import VirtualEnsemble
+from .virtualrealization import VirtualRealization
 
 logger = logging.getLogger(__name__)
 

src/fmu/ensemble/realization.py

@@ -7,30 +7,29 @@
 an archived realization.
 """
 
-import os
-import re
 import copy
 import glob
 import json
-from datetime import datetime, date, time
-import dateutil
 import logging
+import os
+import re
 import warnings
+from datetime import date, datetime, time
 
-import yaml
+import dateutil
 import numpy as np
 import pandas as pd
-
-from resdata.summary import Summary
-from resdata.resfile import ResdataFile
-from resdata.rd_util import FileMode
+import yaml
 from resdata.grid import Grid
+from resdata.rd_util import FileMode
+from resdata.resfile import ResdataFile
+from resdata.summary import Summary
 
-from .virtualrealization import VirtualRealization
 from .realizationcombination import RealizationCombination
-from .util import parse_number, flatten, shortcut2path
-from .util.rates import compute_volumetric_rates
+from .util import flatten, parse_number, shortcut2path
 from .util.dates import unionize_smry_dates
+from .util.rates import compute_volumetric_rates
+from .virtualrealization import VirtualRealization
 
 HAVE_ECL2DF = False
 try:

src/fmu/ensemble/util/__init__.py

@@ -1,6 +1,5 @@
 """Common utility functions used in fmu.ensemble"""
 
-
 import os
 from collections.abc import MutableMapping
 

src/fmu/ensemble/util/dates.py

@@ -1,12 +1,12 @@
 """Common utility functions used in fmu.ensemble"""
 
-
 import datetime
-import dateutil
-import pandas as pd
 import logging
 from typing import List, Tuple
 
+import dateutil
+import pandas as pd
+
 logger = logging.getLogger(__name__)
 
 """Mapping from fmu-ensemble custom offset strings to Pandas DateOffset strings.

src/fmu/ensemble/util/rates.py

@@ -1,10 +1,9 @@
 """Common utility functions for rates used in fmu.ensemble"""
 
-
 import calendar
-import dateutil
 import logging
 
+import dateutil
 import pandas as pd
 
 logger = logging.getLogger(__name__)

src/fmu/ensemble/virtualensemble.py

@@ -1,20 +1,19 @@
 """Module containing a VirtualEnsemble class"""
 
-
+import datetime
+import fnmatch
+import logging
 import os
 import re
 import shutil
-import fnmatch
-import datetime
 import warnings
-import logging
 
-import yaml
 import numpy as np
 import pandas as pd
+import yaml
 
-from .virtualrealization import VirtualRealization
 from .ensemblecombination import EnsembleCombination
+from .virtualrealization import VirtualRealization
 
 try:
     import pyarrow

src/fmu/ensemble/virtualrealization.py

@@ -1,17 +1,18 @@
 """Contains the VirtualRealization class"""
-import os
+
 import fnmatch
+import logging
+import os
 import shutil
 import warnings
-import logging
 
-import pandas as pd
 import numpy as np
+import pandas as pd
 
 from .realizationcombination import RealizationCombination
 from .util import shortcut2path
-from .util.rates import compute_volumetric_rates
 from .util.dates import date_range
+from .util.rates import compute_volumetric_rates
 
 logger = logging.getLogger(__name__)
 

tests/test_batch.py

@@ -1,11 +1,10 @@
 """Testing batch functions in fmu-ensemble."""
 
-import os
 import logging
+import os
 
 import yaml
-
-from fmu.ensemble import ScratchEnsemble, EnsembleSet
+from fmu.ensemble import EnsembleSet, ScratchEnsemble
 
 logger = logging.getLogger(__name__)
 

tests/test_dates.py

@@ -1,7 +1,6 @@
 from datetime import datetime as dt
 
 import pytest
-
 from fmu.ensemble.util.dates import _fallback_date_roll, date_range
 
 # These tests are duplicated from https://github.com/equinor/res2df/blob/master/tests/test_summary.py

tests/test_ecl2df.py

@@ -1,10 +1,9 @@
 """Testing incorporation of ecl2df in fmu-ensemble."""
 
-import os
 import logging
+import os
 
 import pytest
-
 from fmu.ensemble import ScratchEnsemble, ScratchRealization
 
 HAVE_ECL2DF = True

tests/test_ensemble.py

@@ -1,19 +1,16 @@
 """Testing fmu-ensemble."""
 # pylint: disable=protected-access
 
-import os
 import logging
+import os
 
-import yaml
 import numpy
 import pandas as pd
-
 import pytest
-
-from .test_ensembleset import symlink_iter
-
+import yaml
 from fmu.ensemble import ScratchEnsemble, ScratchRealization
 
+from .test_ensembleset import symlink_iter
 
 try:
     SKIP_FMU_TOOLS = False

tests/test_ensemble_agg.py

@@ -1,11 +1,10 @@
 """Testing aggregation of ensembles."""
 
-import os
 import logging
+import os
 
 import pandas as pd
 import pytest
-
 from fmu.ensemble import ScratchEnsemble
 
 logger = logging.getLogger(__name__)

tests/test_ensemble_eclfail.py

@@ -7,14 +7,13 @@
 not try to distuingish between early exits from failure or deliberate (like this).
 """
 
-import os
+import datetime
 import logging
+import os
 import shutil
-import datetime
 
 import numpy as np
 import pandas as pd
-
 from fmu.ensemble import ScratchEnsemble
 
 logger = logging.getLogger(__name__)

tests/test_ensemblecombination.py

@@ -1,11 +1,10 @@
 """Testing linear combinations of ensemble."""
 
-import os
 import logging
-import pandas as pd
+import os
 
+import pandas as pd
 import pytest
-
 from fmu import ensemble
 
 logger = logging.getLogger(__name__)

tests/test_ensembleset.py

@@ -1,15 +1,14 @@
 """Testing fmu-ensemble, EnsembleSet class."""
 
+import glob
+import logging
 import os
 import re
-import glob
 import shutil
-import logging
 
 import pandas as pd
 import pytest
-
-from fmu.ensemble import ScratchEnsemble, EnsembleSet
+from fmu.ensemble import EnsembleSet, ScratchEnsemble
 
 try:
     SKIP_FMU_TOOLS = False

tests/test_etc.py

@@ -1,7 +1,6 @@
 """Test a deprecated submodule"""
 
 import pytest
-
 from fmu import ensemble