subscript 1.11.0__tar.gz → 1.12.0__tar.gz

{subscript-1.11.0 → subscript-1.12.0}/.github/workflows/codecov.yml

@@ -16,6 +16,12 @@ jobs:
       PYTHON: '3.8'
 
     steps:
+
+    - name: Install Ubuntu dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install libegl1
+
     - uses: actions/checkout@v4
 
     - name: Setup Python

{subscript-1.11.0 → subscript-1.12.0}/.github/workflows/subscript.yml

@@ -25,6 +25,12 @@ jobs:
         python-version: ["3.8", "3.9", "3.10", "3.11"]
 
     steps:
+
+      - name: Install Ubuntu dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install libegl1
+
       - name: Checkout commit locally
         uses: actions/checkout@v4
         with:

{subscript-1.11.0 → subscript-1.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: subscript
-Version: 1.11.0
+Version: 1.12.0
 Summary: Equinor's collection of subsurface reservoir modelling scripts
 Author-email: Equinor <rnyb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -731,7 +731,7 @@ Requires-Dist: types-PyYAML; extra == "tests"
 Requires-Dist: types-python-dateutil; extra == "tests"
 Provides-Extra: docs
 Requires-Dist: autoapi; extra == "docs"
-Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: sphinx<8.2.0; extra == "docs"
 Requires-Dist: sphinx-argparse; extra == "docs"
 Requires-Dist: sphinx-autodoc-typehints<2.4; extra == "docs"
 Requires-Dist: sphinx-copybutton; extra == "docs"

{subscript-1.11.0 → subscript-1.12.0}/pyproject.toml

@@ -73,7 +73,7 @@ tests = [
 ]
 docs = [
     "autoapi",
-    "sphinx",
+    "sphinx<8.2.0",
     "sphinx-argparse",
     "sphinx-autodoc-typehints<2.4",
     "sphinx-copybutton",

{subscript-1.11.0 → subscript-1.12.0}/src/subscript/csv_merge/csv_merge.py

@@ -9,7 +9,6 @@ from typing import Dict, List, Optional
 
 import ert
 import pandas as pd
-from ert.config import ErtScript
 
 from subscript import __version__, getLogger
 from subscript.eclcompress.eclcompress import glob_patterns
@@ -56,7 +55,7 @@ class CustomFormatter(
     # pylint: disable=unnecessary-pass
 
 
-class CsvMerge(ErtScript):
+class CsvMerge(ert.ErtScript):
     """A class with a run() function that can be registered as an ERT plugin"""
 
     # pylint: disable=too-few-public-methods

{subscript-1.11.0 → subscript-1.12.0}/src/subscript/csv_stack/csv_stack.py

@@ -10,7 +10,6 @@ from typing import Pattern
 
 import ert
 import pandas as pd
-from ert.config import ErtScript
 
 from subscript import __version__, getLogger
 
@@ -93,7 +92,7 @@ class CustomFormatter(
     # pylint: disable=unnecessary-pass
 
 
-class CsvStack(ErtScript):
+class CsvStack(ert.ErtScript):
     """A class with a run() function that can be registered as an ERT plugin,
     to be used as an ERT workflow (wrapping the command line utility)"""
 

{subscript-1.11.0 → subscript-1.12.0}/src/subscript/field_statistics/field_statistics.py

@@ -23,7 +23,6 @@ import fmu.config.utilities as utils
 import numpy as np
 import xtgeo
 import yaml
-from ert.config import ErtScript
 
 import subscript
 
@@ -1793,7 +1792,7 @@ if __name__ == "__main__":
         file.write("\n")
 
 
-class FieldStatistics(ErtScript):
+class FieldStatistics(ert.ErtScript):
     """This class defines the ERT workflow hook.
 
     It is constructed to work identical to the command line except

{subscript-1.11.0 → subscript-1.12.0}/src/subscript/fmu_copy_revision/fmu_copy_revision.py

@@ -280,7 +280,7 @@ def get_parser() -> argparse.ArgumentParser:
         "--profile",
         dest="profile",
         type=int,
-        help="profile for copy profile to use, default is 4",
+        help=f"profile for copy profile to use, default is {DEFAULT_PROFILE}",
     )
     parser.add_argument(
         "--threads",
@@ -401,6 +401,15 @@ class CopyFMU:
         logger.info("Default target is %s", self.default_target.resolve())
 
     def construct_target(self, proposal):
+        def _clean_folder(folder):
+            """Remove all files and subdirectories inside the folder,
+            while keeping the folder itself intact, unlike shutil.rmtree."""
+            for item in Path(folder).iterdir():
+                if item.is_dir():
+                    shutil.rmtree(item)
+                else:
+                    item.unlink()
+
         """Final target as abs path string, and evaluate cleanup or merge."""
         target = Path(proposal)
         self.target = str(target.absolute())
@@ -413,7 +422,8 @@ class CopyFMU:
             print(f"Target is already present: <{self.target}>")
             if self.args.cleanup:
                 print("Doing cleanup of current target...")
-                shutil.rmtree(self.target)
+                _clean_folder(self.target)
+
             elif self.args.merge:
                 print("Doing merge copy of current target...")
             else:
@@ -676,7 +686,7 @@ def main(args=None) -> None:
         runner.do_rsyncing()
     else:
         print("Command line mode!")
-        runner.profile = int(runner.args.profile)
+        runner.profile = int(runner.args.profile or DEFAULT_PROFILE)
         runner.source = runner.args.source
         runner.batch = True
 

{subscript-1.11.0 → subscript-1.12.0}/src/subscript/fmuobs/fmuobs.py

@@ -12,7 +12,6 @@ from typing import Optional, Tuple, Union
 import ert
 import pandas as pd
 import yaml
-from ert.config import ErtScript
 
 from subscript import __version__, getLogger
 from subscript.fmuobs.parsers import (
@@ -436,7 +435,7 @@ def dump_results(
             print(ertobs_str)
 
 
-class FmuObs(ErtScript):
+class FmuObs(ert.ErtScript):
     """This class defines the ERT workflow hook.
 
     It is constructed to work identical to the command line except

{subscript-1.11.0 → subscript-1.12.0}/src/subscript/params2csv/params2csv.py

@@ -14,7 +14,6 @@ from pathlib import Path
 
 import ert
 import pandas as pd
-from ert.config import ErtScript
 
 from subscript import __version__, getLogger
 
@@ -96,7 +95,7 @@ class CustomFormatter(
     # pylint: disable=unnecessary-pass
 
 
-class Params2Csv(ErtScript):
+class Params2Csv(ert.ErtScript):
     """A class with a run() function that can be registered as an ERT plugin,
     to be used as an ERT workflow (wrapping the command line utility)"""
 

{subscript-1.11.0 → subscript-1.12.0}/src/subscript/version.py

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.11.0'
-__version_tuple__ = version_tuple = (1, 11, 0)
+__version__ = version = '1.12.0'
+__version_tuple__ = version_tuple = (1, 12, 0)

{subscript-1.11.0 → subscript-1.12.0}/src/subscript.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: subscript
-Version: 1.11.0
+Version: 1.12.0
 Summary: Equinor's collection of subsurface reservoir modelling scripts
 Author-email: Equinor <rnyb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -731,7 +731,7 @@ Requires-Dist: types-PyYAML; extra == "tests"
 Requires-Dist: types-python-dateutil; extra == "tests"
 Provides-Extra: docs
 Requires-Dist: autoapi; extra == "docs"
-Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: sphinx<8.2.0; extra == "docs"
 Requires-Dist: sphinx-argparse; extra == "docs"
 Requires-Dist: sphinx-autodoc-typehints<2.4; extra == "docs"
 Requires-Dist: sphinx-copybutton; extra == "docs"

{subscript-1.11.0 → subscript-1.12.0}/src/subscript.egg-info/requires.txt

@@ -19,7 +19,7 @@ xtgeo
 
 [docs]
 autoapi
-sphinx
+sphinx<8.2.0
 sphinx-argparse
 sphinx-autodoc-typehints<2.4
 sphinx-copybutton

{subscript-1.11.0 → subscript-1.12.0}/tests/test_fmu_copy_revision.py

@@ -7,6 +7,7 @@ from pathlib import Path
 import pytest
 
 import subscript.fmu_copy_revision.fmu_copy_revision as fcr
+from subscript.fmu_copy_revision.fmu_copy_revision import DEFAULT_PROFILE
 
 SCRIPTNAME = "fmu_copy_revision"
 
@@ -265,6 +266,15 @@ def test_integration():
     assert subprocess.check_output([SCRIPTNAME, "-h"])
 
 
+def test_default_profile(datatree):
+    """Test command line mode"""
+    os.chdir(datatree)
+    result = subprocess.run(
+        ["fmu_copy_revision", "--source", datatree], check=True, stdout=subprocess.PIPE
+    )
+    assert f"Doing copy with profile {DEFAULT_PROFILE}" in result.stdout.decode()
+
+
 def test_choice_profile1(datatree):
     """Test interactive mode, using profile 1."""
     os.chdir(datatree)