subscript 1.13.0__tar.gz → 1.13.1__tar.gz

{subscript-1.13.0 → subscript-1.13.1}/.github/workflows/subscript.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.11", "3.12"]
 
     steps:
 
@@ -63,6 +63,11 @@ jobs:
           ResInsight --console --help | grep "ResInsight v. 2020.10" \
             && pip install rips==2020.10.0.2 || true
 
+      - name: Log OPM-Flow and ResInsight version
+        run: |
+          flow --version
+          ResInsight --console --version
+
       - name: List all installed packages
         run: pip freeze
 

{subscript-1.13.0 → subscript-1.13.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: subscript
-Version: 1.13.0
+Version: 1.13.1
 Summary: Equinor's collection of subsurface reservoir modelling scripts
 Author-email: Equinor <rnyb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -689,13 +689,11 @@ Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Utilities
 Classifier: Operating System :: POSIX :: Linux
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Natural Language :: English
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
-Requires-Python: >=3.9
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: resdata
@@ -743,7 +741,7 @@ Dynamic: license-file
 
 [![subscript](https://github.com/equinor/subscript/actions/workflows/subscript.yml/badge.svg)](https://github.com/equinor/subscript/actions/workflows/subscript.yml)
 [![codecov](https://codecov.io/gh/equinor/subscript/branch/master/graph/badge.svg)](https://codecov.io/gh/equinor/subscript)
-![Python Version](https://img.shields.io/badge/python-3.9%20|%203.10%20|%203.11%20|%203.12-blue.svg)
+![Python Version](https://img.shields.io/badge/python-3.11%20%7C%203.12-blue.svg)
 [![License: GPL v3](https://img.shields.io/github/license/equinor/subscript)](https://www.gnu.org/licenses/gpl-3.0)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 

{subscript-1.13.0 → subscript-1.13.1}/README.md

@@ -2,7 +2,7 @@
 
 [![subscript](https://github.com/equinor/subscript/actions/workflows/subscript.yml/badge.svg)](https://github.com/equinor/subscript/actions/workflows/subscript.yml)
 [![codecov](https://codecov.io/gh/equinor/subscript/branch/master/graph/badge.svg)](https://codecov.io/gh/equinor/subscript)
-![Python Version](https://img.shields.io/badge/python-3.9%20|%203.10%20|%203.11%20|%203.12-blue.svg)
+![Python Version](https://img.shields.io/badge/python-3.11%20%7C%203.12-blue.svg)
 [![License: GPL v3](https://img.shields.io/github/license/equinor/subscript)](https://www.gnu.org/licenses/gpl-3.0)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 

{subscript-1.13.0 → subscript-1.13.1}/pyproject.toml

@@ -13,7 +13,7 @@ write_to = "src/subscript/version.py"
 name = "subscript"
 description = "Equinor's collection of subsurface reservoir modelling scripts"
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.11"
 license = { file = "LICENSE" }
 authors = [
     { name = "Equinor", email = "rnyb@equinor.com" },
@@ -27,8 +27,6 @@ classifiers = [
     "Topic :: Software Development :: Libraries",
     "Topic :: Utilities",
     "Operating System :: POSIX :: Linux",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Natural Language :: English",

{subscript-1.13.0 → subscript-1.13.1}/src/subscript/interp_relperm/interp_relperm.py

@@ -375,21 +375,21 @@ def process_config(cfg: Dict[str, Any], root_path: Optional[Path] = None) -> Non
             sys.exit(1)
 
         logger.info("Loading relperm parametrization from %s", config.pyscalfile)
-        param_dframe = pyscal.PyscalFactory.load_relperm_df(
-            config.pyscalfile
-        ).set_index("CASE")
+        param_dframe = pyscal.factory.load_relperm_df(config.pyscalfile).set_index(
+            "CASE"
+        )
         base_df = (
-            pyscal.PyscalFactory.create_pyscal_list(param_dframe.loc["base"])
+            pyscal.factory.create_pyscal_list(param_dframe.loc["base"])
             .df()
             .set_index("SATNUM")
         )
         low_df = (
-            pyscal.PyscalFactory.create_pyscal_list(param_dframe.loc["low"])
+            pyscal.factory.create_pyscal_list(param_dframe.loc["low"])
             .df()
             .set_index("SATNUM")
         )
         high_df = (
-            pyscal.PyscalFactory.create_pyscal_list(param_dframe.loc["high"])
+            pyscal.factory.create_pyscal_list(param_dframe.loc["high"])
             .df()
             .set_index("SATNUM")
         )

{subscript-1.13.0 → subscript-1.13.1}/src/subscript/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.13.0'
-__version_tuple__ = version_tuple = (1, 13, 0)
+__version__ = version = '1.13.1'
+__version_tuple__ = version_tuple = (1, 13, 1)

{subscript-1.13.0 → subscript-1.13.1}/src/subscript.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: subscript
-Version: 1.13.0
+Version: 1.13.1
 Summary: Equinor's collection of subsurface reservoir modelling scripts
 Author-email: Equinor <rnyb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -689,13 +689,11 @@ Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Utilities
 Classifier: Operating System :: POSIX :: Linux
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Natural Language :: English
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
-Requires-Python: >=3.9
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: resdata
@@ -743,7 +741,7 @@ Dynamic: license-file
 
 [![subscript](https://github.com/equinor/subscript/actions/workflows/subscript.yml/badge.svg)](https://github.com/equinor/subscript/actions/workflows/subscript.yml)
 [![codecov](https://codecov.io/gh/equinor/subscript/branch/master/graph/badge.svg)](https://codecov.io/gh/equinor/subscript)
-![Python Version](https://img.shields.io/badge/python-3.9%20|%203.10%20|%203.11%20|%203.12-blue.svg)
+![Python Version](https://img.shields.io/badge/python-3.11%20%7C%203.12-blue.svg)
 [![License: GPL v3](https://img.shields.io/github/license/equinor/subscript)](https://www.gnu.org/licenses/gpl-3.0)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 

{subscript-1.13.0 → subscript-1.13.1}/tests/test_check_swatinit_simulators.py

@@ -795,16 +795,6 @@ def test_no_unrst(tmp_path, mocker, flow_simulator):
         main()
 
 
-def test_no_rptrst(tmp_path, mocker, flow_simulator):
-    """Test what happens when RPTRST is not included, no UNRST"""
-    os.chdir(tmp_path)
-    model = PillarModel(rptrst="")
-    run_reservoir_simulator(flow_simulator, model, perform_qc=False)
-    mocker.patch("sys.argv", ["check_swatinit", "FOO.DATA"])
-    with pytest.raises(SystemExit, match="UNRST"):
-        main()
-
-
 def test_rptrst_basic_1(simulator, tmp_path, mocker):
     """Test what happens when RPTRST is BASIC=1"""
     os.chdir(tmp_path)

{subscript-1.13.0 → subscript-1.13.1}/tests/test_interp_relperm.py

@@ -6,7 +6,7 @@ import pandas as pd
 import pytest
 import yaml
 from pydantic import ValidationError
-from pyscal import PyscalFactory
+from pyscal.factory import create_pyscal_list
 from pyscal.utils.testing import sat_table_str_ok
 from res2df import satfunc
 
@@ -365,17 +365,17 @@ def mock_family_1():
         data=[[1, 3, 3, 3, 3, 0.1, 2, -2, 0.25, 300, 150]],
     )
     Path("pess.inc").write_text(
-        PyscalFactory.create_pyscal_list(dframe_pess).build_eclipse_data(family=1),
+        create_pyscal_list(dframe_pess).build_eclipse_data(family=1),
         encoding="utf-8",
     )
 
     Path("base.inc").write_text(
-        PyscalFactory.create_pyscal_list(dframe_base).build_eclipse_data(family=1),
+        create_pyscal_list(dframe_base).build_eclipse_data(family=1),
         encoding="utf-8",
     )
 
     Path("opt.inc").write_text(
-        PyscalFactory.create_pyscal_list(dframe_opt).build_eclipse_data(family=1),
+        create_pyscal_list(dframe_opt).build_eclipse_data(family=1),
         encoding="utf-8",
     )
 
@@ -481,21 +481,21 @@ def test_mock_two_satnums_via_files(tmp_path):
     # pylint: disable=no-value-for-parameter
     os.chdir(tmp_path)
     Path("pess.inc").write_text(
-        PyscalFactory.create_pyscal_list(
-            TWO_SATNUM_PYSCAL_MOCK.loc["low"]
-        ).build_eclipse_data(family=1),
+        create_pyscal_list(TWO_SATNUM_PYSCAL_MOCK.loc["low"]).build_eclipse_data(
+            family=1
+        ),
         encoding="utf-8",
     )
     Path("base.inc").write_text(
-        PyscalFactory.create_pyscal_list(
-            TWO_SATNUM_PYSCAL_MOCK.loc["base"]
-        ).build_eclipse_data(family=1),
+        create_pyscal_list(TWO_SATNUM_PYSCAL_MOCK.loc["base"]).build_eclipse_data(
+            family=1
+        ),
         encoding="utf-8",
     )
     Path("opt.inc").write_text(
-        PyscalFactory.create_pyscal_list(
-            TWO_SATNUM_PYSCAL_MOCK.loc["high"]
-        ).build_eclipse_data(family=1),
+        create_pyscal_list(TWO_SATNUM_PYSCAL_MOCK.loc["high"]).build_eclipse_data(
+            family=1
+        ),
         encoding="utf-8",
     )
 
@@ -582,19 +582,19 @@ def test_mock_two_satnums_via_fam2_files(tmp_path, int_param, expected_file):
     """Test that we can interpolate via family 2 input files"""
     os.chdir(tmp_path)
     Path("pess.inc").write_text(
-        PyscalFactory.create_pyscal_list(
-            TWO_SATNUM_PYSCAL_MOCK.loc["low"], h=0.1
-        ).build_eclipse_data(family=2),
+        create_pyscal_list(TWO_SATNUM_PYSCAL_MOCK.loc["low"], h=0.1).build_eclipse_data(
+            family=2
+        ),
         encoding="utf-8",
     )
     Path("base.inc").write_text(
-        PyscalFactory.create_pyscal_list(
+        create_pyscal_list(
             TWO_SATNUM_PYSCAL_MOCK.loc["base"], h=0.1
         ).build_eclipse_data(family=2),
         encoding="utf-8",
     )
     Path("opt.inc").write_text(
-        PyscalFactory.create_pyscal_list(
+        create_pyscal_list(
             TWO_SATNUM_PYSCAL_MOCK.loc["high"], h=0.1
         ).build_eclipse_data(family=2),
         encoding="utf-8",