completor 1.1.0__tar.gz → 1.1.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: completor
-Version: 1.1.0
+Version: 1.1.2
 Summary: Advanced mulit-segmented well completion tool.
 Home-page: https://github.com/equinor/completor
 License: LGPL-3.0-only
@@ -14,15 +14,15 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Provides-Extra: ert
 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: ert (>11.1.0) ; extra == "ert"
+Requires-Dist: matplotlib (>=3.6,<4.0)
+Requires-Dist: numpy (<2)
 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: pytest-env (>=1,<2)
 Requires-Dist: rstcheck-core (>=1.2.1,<2.0.0) ; extra == "ert"
-Requires-Dist: scipy (>=1.14.1,<2.0.0)
-Requires-Dist: tqdm (>=4.66.5,<5.0.0)
+Requires-Dist: scipy (>=1.10,<2.0)
+Requires-Dist: tqdm (>=4.50,<5.0)
 Project-URL: Bug Tracker, https://github.com/equinor/completor/issues
 Project-URL: Documentation, https://equinor.github.io/completor
 Project-URL: Repository, https://github.com/equinor/completor

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

@@ -89,7 +89,6 @@ def create(
     """
     case = ReadCasefile(case_file=case_file, schedule_file=schedule, output_file=new_file)
     active_wells = utils.get_active_wells(case.completion_table, case.gp_perf_devicelayer)
-
     figure_name = None
     if show_fig:
         figure_no = 1
@@ -123,11 +122,13 @@ def create(
         for chunk in find_keyword_data(Keywords.COMPLETION_SEGMENTS, schedule):
             clean_data = clean_raw_data(chunk, Keywords.COMPLETION_SEGMENTS)
             meaningful_data = read_schedule.set_compsegs(meaningful_data, clean_data)
-
         for i, well_name in tqdm(enumerate(active_wells.tolist()), total=len(active_wells)):
-            well = Well(well_name, i, case, meaningful_data[well_name])
+            try:
+                well = Well(well_name, i, case, meaningful_data[well_name])
+            except KeyError:
+                logger.warning(f"Well '{well_name}' is written in case file but does not exist in schedule file.")
+                continue
             compdat, welsegs, compsegs, bonus = create_output.format_output(well, case, figure_name)
-
             for keyword in [Keywords.COMPLETION_SEGMENTS, Keywords.WELL_SEGMENTS, Keywords.COMPLETION_DATA]:
                 old_data = find_well_keyword_data(well_name, keyword, schedule)
                 if not old_data:

{completor-1.1.0 → completor-1.1.2}/completor/utils.py

@@ -338,7 +338,7 @@ def find_well_keyword_data(well: str, keyword: str, text: str) -> str:
                 if once:
                     lines.append(line)
                 continue
-            if well in line.split()[0]:
+            if well == line.split()[0].replace("'", "").replace('"', ""):
                 if keyword in [Keywords.WELL_SEGMENTS, Keywords.COMPLETION_SEGMENTS]:
                     # These keywords should just be the entire match as they never contain more than one well.
                     return match

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "completor"
-version = "1.1.0"
+version = "1.1.2"
 description = "Advanced mulit-segmented well completion tool."
 authors = ["Equinor ASA <opensource@equinor.com>"]
 repository = "https://github.com/equinor/completor"
@@ -20,16 +20,16 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = ">=3.11, <3.12"
-matplotlib = "^3.9.2"
-numpy = "<2.0.0"
+matplotlib = "^3.6"
+numpy = "<2"
 pandas = "^2.1.4"
-scipy = "^1.14.1"
-tqdm = "^4.66.5"
-pytest-env = "^1.1.4"
+scipy = "^1.10"
+tqdm = "^4.50"
+pytest-env = "^1"
 
 docutils = {version="0.20.1", optional=true} # Pinned due to problems with OS spesific builds
 rstcheck-core = {version="^1.2.1", optional=true}
-ert = {version="^11.1.0", optional=true}
+ert = {version=">11.1.0", optional=true}
 pyqt5-qt5 = {version="5.15.2", optional=true} # Pinned due to problems with OS spesific builds
 
 [tool.poetry.group.dev.dependencies]