Skip to content

Commit 3328410

Browse files
authored
MAINT: Change import order for RMS 15.2 (#435)
1 parent 2a4c5f5 commit 3328410

3 files changed

Lines changed: 241 additions & 253 deletions

File tree

src/fmu/tools/__init__.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,15 @@
77

88
_logger = logging.getLogger(__name__)
99

10+
from fmu.tools.extract_grid_zone_tops_etc import extract_grid_zone_tops # noqa
11+
from fmu.tools.qcforward.qcforward import wellzonation_vs_grid # noqa
12+
from fmu.tools.qcproperties.qcproperties import QCProperties # noqa
13+
from fmu.tools.domainconversion.dconvert import DomainConversion # noqa
14+
from fmu.tools.utilities.sample_attributes import sample_attributes_for_sim2seis # noqa
15+
from fmu.tools.nestedhybridgrid.nestedhybrid import create_nested_hybrid_grid # noqa
16+
from fmu.tools.nestedhybridgrid.nestedhybrid import nnc_to_flowsimulator_input # noqa
17+
from fmu.tools.nestedhybridgrid.nestedhybrid import nnc_to_gridproperty # noqa
18+
1019
ROXAR = True
1120
try:
1221
import rmsapi # type: ignore # noqa
@@ -22,15 +31,6 @@
2231

2332
_logger.debug("Being inside RMS/RMSAPI: %s", ROXAR)
2433

25-
from fmu.tools.extract_grid_zone_tops_etc import extract_grid_zone_tops # noqa
26-
from fmu.tools.qcforward.qcforward import wellzonation_vs_grid # noqa
27-
from fmu.tools.qcproperties.qcproperties import QCProperties # noqa
28-
from fmu.tools.domainconversion.dconvert import DomainConversion # noqa
29-
from fmu.tools.utilities.sample_attributes import sample_attributes_for_sim2seis # noqa
30-
from fmu.tools.nestedhybridgrid.nestedhybrid import create_nested_hybrid_grid # noqa
31-
from fmu.tools.nestedhybridgrid.nestedhybrid import nnc_to_flowsimulator_input # noqa
32-
from fmu.tools.nestedhybridgrid.nestedhybrid import nnc_to_gridproperty # noqa
33-
3434
__all__ = [
3535
"extract_grid_zone_tops",
3636
"wellzonation_vs_grid",

tests/rms/test_import_localmodule.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
"""Test code for rms local module function."""
22

33
import os
4-
import sys
54
from pathlib import Path
65

76
import pytest
@@ -19,7 +18,6 @@ def say_hello(name):
1918

2019

2120
@preserve_cwd
22-
@pytest.mark.skipif(sys.version_info > (3, 11), reason="Fails in Python 3.12")
2321
@pytest.mark.parametrize(
2422
"modulename, shall_warn, shall_fail",
2523
[

0 commit comments

Comments
 (0)