subscript 1.14.5__tar.gz → 1.14.7__tar.gz

{subscript-1.14.5 → subscript-1.14.7}/.github/workflows/subscript.yml

@@ -26,9 +26,17 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.11", "3.12", "3.13"]
+        pandas-version: [""]
+        include:
+          - python-version: "3.13"
+            pandas-version: ">=2,<3"
+          - python-version: "3.13"
+            pandas-version: ">=3.0.0"
+        exclude:
+          - python-version: "3.13"
+            pandas-version: ""
 
     steps:
-
       - name: Install Ubuntu dependencies
         run: |
           sudo apt-get update
@@ -63,6 +71,10 @@ jobs:
         run: |
           uv pip install ".[tests, docs]"
 
+      - name: Pin pandas version
+        if: matrix.pandas-version
+        run: uv pip install "pandas${{ matrix.pandas-version }}"
+
       - name: Log OPM-Flow version
         run: |
           flow --version

{subscript-1.14.5 → subscript-1.14.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: subscript
-Version: 1.14.5
+Version: 1.14.7
 Summary: Equinor's collection of subsurface reservoir modelling scripts
 Author-email: Equinor <rnyb@equinor.com>
 License-Expression: GPL-3.0-only
@@ -31,7 +31,7 @@ Requires-Dist: jinja2
 Requires-Dist: matplotlib
 Requires-Dist: numpy
 Requires-Dist: opm>=2023.04
-Requires-Dist: pandas
+Requires-Dist: pandas>=2
 Requires-Dist: pydantic
 Requires-Dist: pyscal
 Requires-Dist: pyyaml
@@ -56,12 +56,12 @@ Requires-Dist: types-seaborn; extra == "tests"
 Requires-Dist: scipy-stubs; extra == "tests"
 Provides-Extra: docs
 Requires-Dist: autoapi; extra == "docs"
-Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: sphinx<9; extra == "docs"
 Requires-Dist: sphinx-argparse; extra == "docs"
 Requires-Dist: sphinx-autodoc-typehints; extra == "docs"
 Requires-Dist: sphinx-copybutton; extra == "docs"
 Requires-Dist: sphinx-togglebutton; extra == "docs"
-Requires-Dist: sphinx_rtd_theme; extra == "docs"
+Requires-Dist: sphinx_rtd_theme>=3.1.0.rc1; extra == "docs"
 Dynamic: license-file
 
 # subscript

{subscript-1.14.5 → subscript-1.14.7}/pyproject.toml

@@ -43,7 +43,7 @@ dependencies = [
     "matplotlib",
     "numpy",
     "opm>=2023.04",
-    "pandas",
+    "pandas >= 2",
     "pydantic",
     "pyscal",
     "pyyaml",
@@ -72,12 +72,12 @@ tests = [
 ]
 docs = [
     "autoapi",
-    "sphinx",
+    "sphinx < 9",
     "sphinx-argparse",
     "sphinx-autodoc-typehints",
     "sphinx-copybutton",
     "sphinx-togglebutton",
-    "sphinx_rtd_theme",
+    "sphinx_rtd_theme >= 3.1.0.rc1",
 ]
 
 [project.urls]
@@ -198,6 +198,9 @@ select = [
     "B",  # flake8-bugbear
     "ANN",  # flake8-annotations
 ]
+
+preview = true
+
 ignore = [
     "C901",  # complex-structure
     "PD013",  # pandas-use-of-dot-stack
@@ -205,6 +208,14 @@ ignore = [
     "PLR0912",  # too-many-branches
     "PLR2004",  # magic-value-comparison
     "PLW2901",  # redefined-loop-name
+    "PLC2701", # import-private-name
+    "PLR0914", # too-many-locals
+    "PLR6301", # no-self-use
+    "PLR0904", # too-many-public-methods
+    "PLR1702", # too-many-nested-blocks
+    "RUF067",  # non empty init module
+    "RUF069",  # unreliable-floating-point-equality
+    "PLC1901",  # compare-to-empty-string
 ]
 
 [tool.ruff.lint.extend-per-file-ignores]

{subscript-1.14.5 → subscript-1.14.7}/src/subscript/casegen_upcars/casegen_upcars.py

@@ -247,10 +247,10 @@ def main():
             throws_j1 = throws_section["j1"]
             throws_j2 = throws_section["j2"]
             throws_dz = throws_section["dz"]
-            for _i1, _i2, _j1, _j2, _dz in zip(
+            for i1, i2, j1, j2, dz in zip(
                 throws_i1, throws_i2, throws_j1, throws_j2, throws_dz, strict=False
             ):
-                throws.append([_i1, _i2, _j1, _j2, _dz])
+                throws.append([i1, i2, j1, j2, dz])
         else:
             throws = []
             for throw in parser.throws:
@@ -548,8 +548,8 @@ def main():
         ]
         file_list.insert(0, dictionary["GRDECL_file"])
         with open(parser.debug_model, "wb", encoding="utf8") as wfd:
-            for _file in file_list:
-                with open(_file, "rb") as file_handle:
+            for file in file_list:
+                with open(file, "rb") as file_handle:
                     shutil.copyfileobj(file_handle, wfd)
 
 

{subscript-1.14.5 → subscript-1.14.7}/src/subscript/casegen_upcars/model.py

@@ -100,15 +100,15 @@ class Model:
             elif isinstance(streak_rect[0], list):
                 streak_rect = [streak_rect[0]] * len(streak_k)
             else:
-                streak_rect = streak_rect * len(streak_k)
+                streak_rect *= len(streak_k)
         else:
             streak_rect = [None] * len(streak_k)
 
         prts = [-1] * nz
         if streak_k is not None:
-            for idx, (_k, _nz) in enumerate(zip(streak_k, streak_nz, strict=False)):
-                if _nz > 0:
-                    if _k - 1 < 0 or _k + _nz - 1 > nz:
+            for idx, (k, nz_) in enumerate(zip(streak_k, streak_nz, strict=False)):
+                if nz_ > 0:
+                    if k - 1 < 0 or k + nz_ - 1 > nz:
                         print(
                             TERMINALCOLORS["WARNING"]
                             + f"Warning: Streak #{idx + 1} is outside "
@@ -116,7 +116,7 @@ class Model:
                             "The streak will be ignored." + TERMINALCOLORS["ENDC"]
                         )
                     else:
-                        prts[_k - 1 : _k + _nz - 1] = [idx] * _nz
+                        prts[k - 1 : k + nz_ - 1] = [idx] * nz_
 
         layer_nz = []
         layer_dz = []
@@ -270,26 +270,26 @@ class Model:
         self._streak_idx = np.full((self._total_nx, self._total_ny, self._total_nz), -1)
         offset = 0
         streak_idx = -1
-        for _prt, _nz in zip(layer_prt, layer_nz, strict=False):
-            if _prt >= 0:
+        for prt, nz_ in zip(layer_prt, layer_nz, strict=False):
+            if prt >= 0:
                 # Streak
                 streak_idx += 1
-                _rect = streak_rect[_prt]
-                if _rect is None or len(_rect) == 0:
+                rect = streak_rect[prt]
+                if rect is None or len(rect) == 0:
                     box_i1 = 0
                     box_i2 = self._total_nx - 1
                     box_j1 = 0
                     box_j2 = self._total_ny - 1
                 else:
-                    box_i1 = max(0, _rect[0] - 1)
-                    box_i2 = min(self._total_nx - 1, _rect[1] - 1)
-                    box_j1 = max(0, _rect[2] - 1)
-                    box_j2 = min(self._total_ny - 1, _rect[3] - 1)
+                    box_i1 = max(0, rect[0] - 1)
+                    box_i2 = min(self._total_nx - 1, rect[1] - 1)
+                    box_j1 = max(0, rect[2] - 1)
+                    box_j2 = min(self._total_ny - 1, rect[3] - 1)
                 self._streak_rect[streak_idx] = [box_i1, box_i2, box_j1, box_j2]
                 self._streak_idx[
-                    box_i1 : box_i2 + 1, box_j1 : box_j2 + 1, offset : offset + _nz
-                ] = _prt
-            offset += _nz
+                    box_i1 : box_i2 + 1, box_j1 : box_j2 + 1, offset : offset + nz_
+                ] = prt
+            offset += nz_
 
         # Layer Index
         self._layer_idx = np.empty(
@@ -298,10 +298,10 @@ class Model:
         self._layer_dz = np.zeros(self._total_nz)
         # self._layer_nz = layer_nz
         offset = 0
-        for idx, _layer_nz in enumerate(layer_nz):
-            self._layer_idx[:, :, offset : offset + _layer_nz] = idx
-            self._layer_dz[offset : offset + _layer_nz] = layer_dz[idx]
-            offset += _layer_nz
+        for idx, layer_nz_ in enumerate(layer_nz):
+            self._layer_idx[:, :, offset : offset + layer_nz_] = idx
+            self._layer_dz[offset : offset + layer_nz_] = layer_dz[idx]
+            offset += layer_nz_
 
         self._matrix_props = {
             "PORO": 0.0,
@@ -407,10 +407,10 @@ Initializing model
             (self._total_nx, self._total_ny, self._total_nz), dtype=np.int16
         )
         # Use length instead of number of cells
-        for _i, idx in enumerate(self._fracture_i):
-            fracture_length = max(0.0, min(1.0, self._fracture_length_y[_i])) * self._ly
+        for i, idx in enumerate(self._fracture_i):
+            fracture_length = max(0.0, min(1.0, self._fracture_length_y[i])) * self._ly
             start_fracture = (
-                min(self._fracture_offset_y[_i], 1.0 - self._fracture_length_y[_i])
+                min(self._fracture_offset_y[i], 1.0 - self._fracture_length_y[i])
                 * self._ly
             )
             start_fracture_idx = np.abs(self._y - start_fracture).argmin()
@@ -418,9 +418,9 @@ Initializing model
                 self._y - (start_fracture + fracture_length)
             ).argmin()
 
-            fracture_height = max(0.0, min(1.0, self._fracture_height_y[_i])) * self._lz
+            fracture_height = max(0.0, min(1.0, self._fracture_height_y[i])) * self._lz
             start_fracture_vert = (
-                min(self._fracture_zoffset_y[_i], 1.0 - self._fracture_height_y[_i])
+                min(self._fracture_zoffset_y[i], 1.0 - self._fracture_height_y[i])
                 * self._lz
             )
             start_fracture_k = np.abs(self._z - start_fracture_vert).argmin()
@@ -432,12 +432,12 @@ Initializing model
                 idx : idx + self._fracture_cell_count,
                 start_fracture_idx:end_fracture_idx,
                 start_fracture_k : end_fracture_k + 1,
-            ] = _i + 1
+            ] = i + 1
 
-        for _i, idx in enumerate(self._fracture_j):
-            fracture_length = max(0.0, min(1.0, self._fracture_length_x[_i])) * self._lx
+        for i, idx in enumerate(self._fracture_j):
+            fracture_length = max(0.0, min(1.0, self._fracture_length_x[i])) * self._lx
             start_fracture = (
-                min(self._fracture_offset_x[_i], 1.0 - self._fracture_length_x[_i])
+                min(self._fracture_offset_x[i], 1.0 - self._fracture_length_x[i])
                 * self._lx
             )
             start_fracture_idx = np.abs(self._x - start_fracture).argmin()
@@ -445,9 +445,9 @@ Initializing model
                 self._x - (start_fracture + fracture_length)
             ).argmin()
 
-            fracture_height = max(0.0, min(1.0, self._fracture_height_x[_i])) * self._lz
+            fracture_height = max(0.0, min(1.0, self._fracture_height_x[i])) * self._lz
             start_fracture_vert = (
-                min(self._fracture_zoffset_x[_i], 1.0 - self._fracture_height_x[_i])
+                min(self._fracture_zoffset_x[i], 1.0 - self._fracture_height_x[i])
                 * self._lz
             )
             start_fracture_k = np.abs(self._z - start_fracture_vert).argmin()
@@ -458,7 +458,7 @@ Initializing model
                 start_fracture_idx:end_fracture_idx,
                 idx : idx + self._fracture_cell_count,
                 start_fracture_k : end_fracture_k + 1,
-            ] = -(_i + 1)
+            ] = -(i + 1)
 
     def _build_grid(self):
         """Create the mesh xv, yv and zv"""
@@ -796,13 +796,13 @@ Initializing model
         print("/", file=buffer_)
 
         print("COORD", file=buffer_)
-        for _i in range(self._xv.shape[0]):
-            for _j in range(self._xv.shape[1]):
+        for i in range(self._xv.shape[0]):
+            for j in range(self._xv.shape[1]):
                 print(
                     "{{x:{0}}} {{y:{0}}} {{z:{0}}} "  # noqa: UP032
                     "{{x:{0}}} {{y:{0}}} {{z:{0}}}".format(
                         self._eclipse_output_float
-                    ).format(x=self._xv[_i, _j], y=self._yv[_i, _j], z=0.0),
+                    ).format(x=self._xv[i, j], y=self._yv[i, j], z=0.0),
                     file=buffer_,
                 )
         print("/", file=buffer_)
@@ -828,7 +828,7 @@ Initializing model
 
     def _print_property(self, stream, keyword, array_value):
         props = array_value.reshape(array_value.size, order="f")
-        if array_value.dtype.str[1] in ["i", "u"]:
+        if array_value.dtype.str[1] in {"i", "u"}:
             value_format = ""
         else:
             value_format = self._eclipse_output_float_compact
@@ -1017,17 +1017,17 @@ Initializing model
                 )
             )
             streak_box = []
-            for _k, nz_size, rect in zip(
+            for k, nz_size, rect in zip(
                 self._streak_k, self._streak_nz, self._streak_rect, strict=False
             ):
-                _k -= 1
+                k -= 1
                 box = self.bounded_box(
                     rect[0] - near_streak_vug_distance_to_streak,
                     rect[1] + near_streak_vug_distance_to_streak,
                     rect[2] - near_streak_vug_distance_to_streak,
                     rect[3] + near_streak_vug_distance_to_streak,
-                    _k - near_streak_vug_distance_to_streak,
-                    _k + nz_size - 1 + near_streak_vug_distance_to_streak,
+                    k - near_streak_vug_distance_to_streak,
+                    k + nz_size - 1 + near_streak_vug_distance_to_streak,
                 )
                 streak_box.append(box)
                 streak_domain_flag[

{subscript-1.14.5 → subscript-1.14.7}/src/subscript/casegen_upcars/udf.py

@@ -41,7 +41,7 @@ def listify(source, count, conversion_func=None):
     if isinstance(source, list):
         # Adjust the size when it is only 1 item
         if len(source) == 1:
-            source = source * count
+            source *= count
 
         if conversion_func is None:
             return source

{subscript-1.14.5 → subscript-1.14.7}/src/subscript/check_swatinit/check_swatinit.py

@@ -55,8 +55,7 @@ def main() -> None:
         check_applicability(eclfiles)
 
         qc_frame = make_qc_gridframe(eclfiles)
-
-        if args.output != "":
+        if args.output:
             logger.info("Exporting CSV to %s", args.output)
             reorder_dframe_for_nonnans(qc_frame).to_csv(args.output, index=False)
 
@@ -65,7 +64,7 @@ def main() -> None:
         return
     qc_vols = qc_volumes(qc_frame)
     print(human_report_qc_vols(qc_vols))
-    qcsum = qc_vols["SWATINIT_WVOL"] + sum([qc_vols[qc_flag] for qc_flag in QC_FLAGS])
+    qcsum = qc_vols["SWATINIT_WVOL"] + sum(qc_vols[qc_flag] for qc_flag in QC_FLAGS)
     diff = qc_vols["SWAT_WVOL"] - qcsum
     if not np.isclose(diff, 0, atol=1e-6):
         print(f"Unexplained difference: {diff} Rm3")

{subscript-1.14.5 → subscript-1.14.7}/src/subscript/convert_grid_format/convert_grid_format.py

@@ -124,7 +124,7 @@ def _convert_ecl2roff(
     if option:  # standardfmu separator
         filesep = "--"
 
-    if mode in ["grid", "init", "restart"]:
+    if mode in {"grid", "init", "restart"}:
         logger.info("Running GRID conversion...")
 
         logger.info("Convert from EGRID to ROFF...")
@@ -138,7 +138,7 @@ def _convert_ecl2roff(
     else:
         raise SystemExit(f"STOP! Invalid mode: <{mode}>")
 
-    if mode in ("restart", "init"):
+    if mode in {"restart", "init"}:
         xtg.say(f"Mode is {mode}")
         logger.info("Running %s conversion...", mode.upper())
         fname, fext = os.path.splitext(filename)
@@ -162,7 +162,7 @@ def _convert_ecl2roff(
         else:
             dates_list = None
 
-        if fext in (".UNRST", ".INIT", ""):
+        if fext in {".UNRST", ".INIT", ""}:
             usext = f".{fformat.upper()}"
             myprops = xtgeo.gridproperties_from_file(
                 fname + usext,

{subscript-1.14.5 → subscript-1.14.7}/src/subscript/csv2ofmvol/csv2ofmvol.py

@@ -179,12 +179,12 @@ def check_consecutive_dates(data: pd.DataFrame) -> None:
         if len(datedeltas) > 1 and checkprod > 0.1:
             logger.warning(
                 "Warning: Uneven date intervals for well %s, check these rows:\n%s",
-                str(well),
-                str(checkrows),
+                well,
+                checkrows,
             )
         if int(datedeltas[0]) != 1:
-            logger.warning("Dates are not daily-consecutive for well %s", str(well))
-            logger.warning("Most common timedelta is: %s", str(dominantdelta))
+            logger.warning("Dates are not daily-consecutive for well %s", well)
+            logger.warning("Most common timedelta is: %s", dominantdelta)
 
 
 def df2vol(data: pd.DataFrame) -> str:
@@ -211,7 +211,7 @@ def df2vol(data: pd.DataFrame) -> str:
 
     unsupported = set(columns_trans) - set(columns)
     if unsupported:
-        logger.warning("Unsupported column(s) %s", str(unsupported))
+        logger.warning("Unsupported column(s) %s", unsupported)
 
     # Translate column names:
     voldata = data.rename(columns=PDMCOLS2VOL, inplace=False)
@@ -281,7 +281,7 @@ def csv2ofmvol_main(csvfilepatterns: list[str], output: str) -> bool:
 
     csvfiles = glob_patterns(csvfilepatterns)
     if set(csvfiles) != set(csvfilepatterns):
-        logger.info("Wildcards used: %s", str(csvfilepatterns))
+        logger.info("Wildcards used: %s", csvfilepatterns)
     if not csvfiles:
         logger.error("No filenames found")
         return False
@@ -303,21 +303,21 @@ def csv2ofmvol_main(csvfilepatterns: list[str], output: str) -> bool:
         outfile.write(volstr)
 
     assert isinstance(data.index, pd.MultiIndex)
-    logger.info("Well count: %s", str(len(data.index.levels[0])))
-    logger.info("Date count: %s", str(len(data.index.levels[1])))
+    logger.info("Well count: %s", len(data.index.levels[0]))
+    logger.info("Date count: %s", len(data.index.levels[1]))
 
     if len(data) > 1:
         startdate = data.index.levels[1].min()
         enddate = data.index.levels[1].max()
         delta = relativedelta(enddate, startdate)
-        logger.info("Date range: %s --> %s", str(startdate.date()), str(enddate.date()))
+        logger.info("Date range: %s --> %s", startdate.date(), enddate.date())
         logger.info(
             "            %s years, %s months, %s days.",
-            str(delta.years),
-            str(delta.months),
-            str(delta.days),
+            delta.years,
+            delta.months,
+            delta.days,
         )
-    logger.info("Written %s lines to %s.", str(len(volstr) + 3), output)
+    logger.info("Written %s lines to %s.", len(volstr) + 3, output)
     return True
 
 

{subscript-1.14.5 → subscript-1.14.7}/src/subscript/csv_merge/csv_merge.py

@@ -192,11 +192,9 @@ def merge_csvfiles(
                     if tag not in dframe:
                         dframe[tag] = tags[tag][idx]
                     else:
-                        logger.warning("Tag %s already in dataframe", str(tag))
+                        logger.warning("Tag %s already in dataframe", tag)
                 else:
-                    logger.warning(
-                        "Could not use tag %s, insufficient length", str(tag)
-                    )
+                    logger.warning("Could not use tag %s, insufficient length", tag)
             logger.info(" - Merging with previously loaded CSV files")
             merged_df = pd.concat(
                 [merged_df, dframe], axis=0, ignore_index=True, sort=False
@@ -222,11 +220,9 @@ def merge_csvfiles(
                     if tag not in dframe:
                         dframe[tag] = tags[tag][idx]
                     else:
-                        logger.warning("Tag %s already in dataframe", str(tag))
+                        logger.warning("Tag %s already in dataframe", tag)
                 else:
-                    logger.warning(
-                        "Could not use tag %s, insufficient length", str(tag)
-                    )
+                    logger.warning("Could not use tag %s, insufficient length", tag)
         logger.info("Merging %d files..", loaded_files)
         merged_df = pd.concat(dfs, axis=0, ignore_index=True, sort=False)
     return merged_df
@@ -290,8 +286,8 @@ def csv_merge_main(
         tags[filecolumn] = csvfiles
     tags = {key: value for key, value in tags.items() if len(value)}
 
-    logger.info("Found tags: %s", str(tags.keys()))
-    logger.debug("Tags: %s", str(tags))
+    logger.info("Found tags: %s", tags.keys())
+    logger.debug("Tags: %s", tags)
 
     merged_df = merge_csvfiles(csvfiles, tags, memoryconservative=memoryconservative)
 
@@ -300,18 +296,18 @@ def csv_merge_main(
         for col in merged_df.columns:
             if len(merged_df[col].unique()) == 1:
                 columnstodelete.append(col)
-        logger.info("Dropping constant columns %s", str(columnstodelete))
+        logger.info("Dropping constant columns %s", columnstodelete)
         merged_df = merged_df.drop(columnstodelete, axis=1)
 
     if merged_df.empty:
         logger.error("No data to output")
         raise NoDataError
 
-    logger.info("Final column list: %s", str(merged_df.columns))
+    logger.info("Final column list: %s", merged_df.columns)
 
     logger.info("Exporting CSV data to %s", output)
 
-    if output in ["-", "stdout"]:
+    if output in {"-", "stdout"}:
         merged_df.to_csv(sys.stdout, index=False)
     else:
         merged_df.to_csv(path_or_buf=output, index=False)

{subscript-1.14.5 → subscript-1.14.7}/src/subscript/csv_stack/csv_stack.py

@@ -244,9 +244,9 @@ def drop_constants(
         if keepminimal and (not (stackmatcher.match(col) or col.lower() in keepthese)):
             columnstodelete.append(col)
     if keepminimal:
-        logger.info("Deleting constant and unwanted columns %s", str(columnstodelete))
+        logger.info("Deleting constant and unwanted columns %s", columnstodelete)
     else:
-        logger.info("Deleting constant columns %s", str(columnstodelete))
+        logger.info("Deleting constant columns %s", columnstodelete)
     logger.info("Deleted %d columns", len(columnstodelete))
     return dframe.drop(columnstodelete, axis=1)
 
@@ -287,7 +287,7 @@ def csv_stack(
     for col in dframe.columns:
         if stackmatcher.match(col):
             tuplecols.append(tuple(col.split(stackseparator)))
-            colstostack = colstostack + 1
+            colstostack += 1
             dostack = True
         else:
             tuplecols.append((col, ""))

{subscript-1.14.5 → subscript-1.14.7}/src/subscript/eclcompress/eclcompress.py

@@ -107,7 +107,7 @@ def eclcompress(
             continue
 
         compressedlines = compress_multiple_keywordsets(keywordsets, filelines)
-        compressedbytecount = sum([len(x) for x in compressedlines])
+        compressedbytecount = sum(len(x) for x in compressedlines)
 
         # 1 means no compression, the higher the better.
         # The header added below is not included in the calculated

{subscript-1.14.5 → subscript-1.14.7}/src/subscript/ecldiff2roff/ecldiff2roff.py

@@ -167,8 +167,8 @@ def ecldiff2roff_main(
         logger.info(
             "Computing difference for property %s between dates %s and %s",
             prop,
-            str(date_pair[0]),
-            str(date_pair[1]),
+            date_pair[0],
+            date_pair[1],
         )
 
         diffprop = prop1.copy()

{subscript-1.14.5 → subscript-1.14.7}/src/subscript/field_statistics/field_statistics.py

@@ -715,7 +715,7 @@ def get_values_in_ertbox(
         ertbox_prop_values = np.ma.masked_all(
             (ertbox_size[0], ertbox_size[1], ertbox_size[2]), dtype=np.int32
         )
-    if conformity.upper() in ["PROPORTIONAL", "TOP_CONFORM"]:
+    if conformity.upper() in {"PROPORTIONAL", "TOP_CONFORM"}:
         ertbox_prop_values[:, :, :nz_zone] = prop_values[:, :, start_layer:end_layer]
     elif conformity.upper() == "BASE_CONFORM":
         start_layer_ertbox = ertbox_size[2] - nz_zone
@@ -764,7 +764,7 @@ def set_values_in_geogrid(
         prop_values = geogrid_property_param.values
 
     # Update only the property of the geogrid for the given zone
-    if conformity.upper() in ["PROPORTIONAL", "TOP_CONFORM"]:
+    if conformity.upper() in {"PROPORTIONAL", "TOP_CONFORM"}:
         prop_values[:, :, start_layer:end_layer] = ertbox_values[:, :, :nz_zone]
     elif conformity.upper() == "BASE_CONFORM":
         start_layer_ertbox = ertbox_size[2] - nz_zone
@@ -1234,7 +1234,7 @@ def check_zone_conformity(zone_code_names, zone_names_used, zone_conformity):
     for zone_name, conformity in zone_conformity.items():
         if zone_name not in list(zone_code_names.values()):
             raise ValueError("Unknown zone names in keyword 'zone_conformity'.")
-        if conformity.upper() not in ["TOP_CONFORM", "BASE_CONFORM", "PROPORTIONAL"]:
+        if conformity.upper() not in {"TOP_CONFORM", "BASE_CONFORM", "PROPORTIONAL"}:
             raise ValueError(
                 "Undefined zone conformity specified "
                 "(Must be Top_conform, Base_conform or Proportional)."
@@ -1876,9 +1876,9 @@ def main():
 if __name__ == "__main__":
     main()
 
-"""
+"""  # noqa: RUF027
     print(f"Write file: {rms_load_script}")
-    with open(rms_load_script, "w") as file:
+    with open(rms_load_script, "w", encoding="utf-8") as file:
         file.write(
             template_string.format(
                 ert_config_path=ert_config_path,

{subscript-1.14.5 → subscript-1.14.7}/src/subscript/fmuobs/fmuobs.py

@@ -166,14 +166,14 @@ def validate_internal_dframe(obs_df: pd.DataFrame) -> bool:
         failed = True
     non_supported_classes = set(obs_df["CLASS"]) - set(CLASS_SHORTNAME.keys())
     if non_supported_classes:
-        logger.error("Unsupported observation classes: %s", str(non_supported_classes))
+        logger.error("Unsupported observation classes: %s", non_supported_classes)
         failed = True
 
     index = {"CLASS", "LABEL", "OBS", "SEGMENT"}.intersection(set(obs_df.columns))
     repeated_rows = obs_df[obs_df.set_index(list(index)).index.duplicated(keep=False)]
     if not repeated_rows.empty:
         logger.error("Non-unique observation classes and labels")
-        logger.error("\n%s", str(repeated_rows.dropna(axis="columns", how="all")))
+        logger.error("\n%s", repeated_rows.dropna(axis="columns", how="all"))
         failed = True
 
     # Possibilities for further validation:
@@ -305,7 +305,7 @@ def fmuobs(
 ) -> None:
     """Alternative to main() with named arguments"""
     if verbose or debug:
-        if __MAGIC_STDOUT__ in (csv, yml, ertobs):
+        if __MAGIC_STDOUT__ in {csv, yml, ertobs}:
             raise SystemExit("Don't use verbose/debug when writing to stdout")
         loglevel = logging.INFO
         if debug: