completor 1.0.1__tar.gz → 1.1.0__tar.gz

{completor-1.0.1 → completor-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: completor
-Version: 1.0.1
+Version: 1.1.0
 Summary: Advanced mulit-segmented well completion tool.
 Home-page: https://github.com/equinor/completor
 License: LGPL-3.0-only
@@ -17,7 +17,7 @@ Requires-Dist: docutils (==0.20.1) ; extra == "ert"
 Requires-Dist: ert (>=11.1.0,<12.0.0) ; extra == "ert"
 Requires-Dist: matplotlib (>=3.9.2,<4.0.0)
 Requires-Dist: numpy (<2.0.0)
-Requires-Dist: pandas (>=2.2.3,<3.0.0)
+Requires-Dist: pandas (>=2.1.4,<3.0.0)
 Requires-Dist: pyqt5-qt5 (==5.15.2) ; extra == "ert"
 Requires-Dist: pytest-env (>=1.1.4,<2.0.0)
 Requires-Dist: rstcheck-core (>=1.2.1,<2.0.0) ; extra == "ert"

{completor-1.0.1 → completor-1.1.0}/completor/create_output.py

@@ -76,7 +76,8 @@ def format_output(well: Well, case: ReadCasefile, figure_name: str | None = None
         if df_annulus.empty:
             logger.info("No annular flow in Well : %s Lateral : %d", well.well_name, lateral.lateral_number)
 
-        start_segment, start_branch = _update_segmentbranch(lateral.df_device, df_annulus)
+        if not lateral.df_device.empty:
+            start_segment, start_branch = _update_segmentbranch(lateral.df_device, df_annulus)
 
         lateral.df_tubing = _connect_lateral(well.well_name, lateral, top, well, case)
 
@@ -234,15 +235,11 @@ def _update_segmentbranch(df_device: pd.DataFrame, df_annulus: pd.DataFrame) ->
     Returns:
         The numbers for starting segment and branch.
 
-    Raises:
-        ValueError: If there is neither device nor annulus data.
     """
-    if df_annulus.empty and df_device.empty:
-        raise ValueError("Cannot determine starting segment and branch without device and annulus data.")
     if df_annulus.empty and not df_device.empty:
         start_segment = max(df_device[Headers.START_SEGMENT_NUMBER].to_numpy()) + 1
         start_branch = max(df_device[Headers.BRANCH].to_numpy()) + 1
-    else:
+    elif not df_annulus.empty:
         start_segment = max(df_annulus[Headers.START_SEGMENT_NUMBER].to_numpy()) + 1
         start_branch = max(df_annulus[Headers.BRANCH].to_numpy()) + 1
     return start_segment, start_branch

{completor-1.0.1 → completor-1.1.0}/completor/main.py

@@ -7,7 +7,6 @@ import os
 import re
 import time
 
-import pandas as pd
 from tqdm import tqdm
 
 from completor import create_output, parse, read_schedule, utils
@@ -27,8 +26,6 @@ from completor.utils import (
 )
 from completor.wells import Well
 
-pd.set_option("future.no_silent_downcasting", True)
-
 
 def get_content_and_path(case_content: str, file_path: str | None, keyword: str) -> tuple[str | None, str | None]:
     """Get the contents of a file from a path defined by user or case file.

{completor-1.0.1 → completor-1.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "completor"
-version = "1.0.1"
+version = "1.1.0"
 description = "Advanced mulit-segmented well completion tool."
 authors = ["Equinor ASA <opensource@equinor.com>"]
 repository = "https://github.com/equinor/completor"
@@ -22,7 +22,7 @@ classifiers = [
 python = ">=3.11, <3.12"
 matplotlib = "^3.9.2"
 numpy = "<2.0.0"
-pandas = "^2.2.3"
+pandas = "^2.1.4"
 scipy = "^1.14.1"
 tqdm = "^4.66.5"
 pytest-env = "^1.1.4"