Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ dependencies = [
"resfo-utilities>=0.1.1",
"polars",
"fastexcel",
"packaging>=26.3",
]
[dependency-groups]
dev = [
Expand Down
14 changes: 11 additions & 3 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,19 @@
import os
import shutil
import subprocess
from importlib.metadata import version
from pathlib import Path

import cwrap
import pytest
from hypothesis import HealthCheck, settings
from packaging.version import Version
from resdata import ResDataType
from resdata.grid import GridGenerator
from resdata.resfile import ResdataKW

if Version(version("resdata")).major < 7:
import cwrap

from tests import legacy_test_data

# Timeout settings are unreliable both on CI and
Expand Down Expand Up @@ -121,7 +125,11 @@ def fixture_grid_prop():
def wrapper(prop_name, value, grid_size, fname):
prop = ResdataKW(prop_name, grid_size, ResDataType.RD_FLOAT)
prop.assign(value)
with cwrap.open(fname, "w") as file:
prop.write_grdecl(file)
if Version(version("resdata")).major < 7:
with cwrap.open(fname, "w") as file:
prop.write_grdecl(file)
else:
with Path(fname).open(mode="w", encoding="utf-8") as file:
prop.write_grdecl(file)

return wrapper
6 changes: 4 additions & 2 deletions uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading