subscript 1.9.0__tar.gz → 1.10.0__tar.gz

{subscript-1.9.0 → subscript-1.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: subscript
-Version: 1.9.0
+Version: 1.10.0
 Summary: Equinor's collection of subsurface reservoir modelling scripts
 Author-email: Equinor <rnyb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{subscript-1.9.0 → subscript-1.10.0}/docs/scripts/fmu_copy_revision.rst

@@ -14,8 +14,8 @@ Copying Profiles
 
 By default some file types and directories will be skipped. Here are some profiles:
 
-#. Copy everything
-#. Copy everything, except:
+1. Copy everything
+2. Copy everything, except:
 
    * Directories with name ``backup``
    * Directories with name ``users``
@@ -24,13 +24,15 @@ By default some file types and directories will be skipped. Here are some profil
    * Files ending with ~
    * Empty folders (except those listed above) will be kept
 
-#. Copy everything, except:
+3. Copy everything, except:
 
    * All folders and files mentioned in option 2
    * The following folders under ``ert/`` (if they exist):
 
       * ``output``
       * ``ert/*/storage``, including ``ert/storage`` (for backward compatibility)
+      * ``ert/model/``
+      * ``ert/model/logs``, including ``ert/output/log`` (for backward compatibility)
 
    * The following folders or files under ``rms/`` (if they exist):
 
@@ -51,15 +53,15 @@ By default some file types and directories will be skipped. Here are some profil
 
    * Empty folders (at destination) except those listed above will kept
 
-#. As profile 3, but also all empty folder (at destination) will removed. This the DEFAULT profile!
-#. As profile 3, but keeps more data:
+4. As profile 3, but also all empty folder (at destination) will removed. This the DEFAULT profile!
+5. As profile 3, but keeps more data:
 
     * Folders and files ``rms/output`` will be kept
     * Folders and files ``share/results`` and share/templates will be kept.
 
-#. Only copy the ``<coviz>`` folder (if present), which shall be under ``<revision>/share/coviz``:
+6. Only copy the ``<coviz>`` folder (if present), which shall be under ``<revision>/share/coviz``:
 
     * Symbolic links will be kept, if possible
 
-#. Make your own filter rules in a named file.
+7. Make your own filter rules in a named file.
 

{subscript-1.9.0 → subscript-1.10.0}/src/subscript/bjobsusers/bjobsusers.py

@@ -143,7 +143,7 @@ def show_status(status: str = "RUN", title: str = "Running", umax: int = 10) ->
     print("--------------")
     for user, count in dframe.iterrows():
         print(
-            count[0],
+            count.iloc[0],
             userinfo(  # lgtm [py/clear-text-logging-sensitive-data]
                 str(user), call_pinky
             ),

{subscript-1.9.0 → subscript-1.10.0}/src/subscript/fmu_copy_revision/fmu_copy_revision.py

@@ -117,6 +117,8 @@ FILTER3_ADD = """
 - ert/output/**
 - ert/storage/**
 - ert/output/storage/**
+- ert/model/logs/**
+- ert/output/log/**
 - input/seismic/**
 - rms/model/*.log
 - rms/output/**
@@ -138,6 +140,7 @@ DIRFILTER3 = """
 - ert/output/
 - ert/storage/
 - ert/**/storage/
+- ert/model/logs/
 - rms/input/seismic/
 - share/results/
 - share/templates/

{subscript-1.9.0 → subscript-1.10.0}/src/subscript/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.9.0'
-__version_tuple__ = version_tuple = (1, 9, 0)
+__version__ = version = '1.10.0'
+__version_tuple__ = version_tuple = (1, 10, 0)

{subscript-1.9.0 → subscript-1.10.0}/src/subscript.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: subscript
-Version: 1.9.0
+Version: 1.10.0
 Summary: Equinor's collection of subsurface reservoir modelling scripts
 Author-email: Equinor <rnyb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{subscript-1.9.0 → subscript-1.10.0}/tests/test_fmu_copy_revision.py

@@ -34,6 +34,9 @@ FILESTRUCTURE = [
     "somefolder/any.backup",
     "somefolder/anybackup99.txt",
     "somefolder/attic/any.txt",
+    "ert/model/test.ert",
+    "ert/model/logs/log.txt",
+    "ert/output/log/another_log.txt",
 ]
 
 
@@ -148,6 +151,9 @@ def test_rsync_profile3(datatree):
     assert not (datatree / target / "rms" / "input" / "faults" / "x.dat").exists()
     assert not (datatree / target / "backup").is_dir()
 
+    assert not (datatree / target / "ert" / "model" / "logs").is_dir()
+    assert not (datatree / target / "ert" / "output" / "log").is_dir()
+
 
 def test_rsync_profile4(datatree):
     """Testing vs filter profile 4."""
@@ -176,6 +182,8 @@ def test_rsync_profile4(datatree):
     assert not (datatree / target / "rms" / "input" / "faults" / "x.dat").exists()
     assert not (datatree / target / "backup").is_dir()
 
+    assert datatree / target / "ert" / "model" / ""
+
 
 @pytest.mark.parametrize(
     "rmsinputperm, profile",