ResSimpy 2.5.3__tar.gz → 2.6.0__tar.gz

{ressimpy-2.5.3 → ressimpy-2.6.0}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: ResSimpy
-Version: 2.5.3
+Version: 2.6.0
 Summary: A Python library for working with Reservoir Simulator Models.
 License: Apache-2.0
 License-File: LICENSE.MD
 Keywords: ResSimpy,Reservoir Engineering
 Author: BP
-Requires-Python: >=3.10,<3.13
+Requires-Python: >=3.10,<3.15
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
@@ -14,12 +14,16 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Scientific/Engineering :: Information Analysis
 Classifier: Topic :: System :: Filesystems
-Requires-Dist: numpy (>=1.23.4,<2)
-Requires-Dist: pandas (>=1.5.0,<2.3)
-Requires-Dist: typing-extensions (>=4.12,<5.0)
+Requires-Dist: numpy (>=2.2,<2.3) ; python_version < "3.11"
+Requires-Dist: numpy (>=2.3,<2.6) ; python_version >= "3.11"
+Requires-Dist: pandas (>=2.3,<3) ; python_version < "3.11"
+Requires-Dist: pandas (>=3.0,<3.0.4) ; python_version >= "3.11"
+Requires-Dist: typing-extensions (>=4.15,<5.0)
 Description-Content-Type: text/markdown
 
 # ResSimpy: Python API for working with Reservoir Simulator models

{ressimpy-2.5.3 → ressimpy-2.6.0}/ResSimpy/DataModelBaseClasses/Grid.py

@@ -37,6 +37,7 @@ class Grid(ABC):
     _grid_properties_loaded: bool = False
     _lgrs: LGRs
     _overs: Sequence[Over]
+    _tolpv: Optional[float]
 
     def __init__(self, assume_loaded: bool = False) -> None:
         """Initialises the Grid class."""
@@ -60,6 +61,9 @@ class Grid(ABC):
         # LGRs
         self._lgrs: LGRs = LGRs()
 
+        # TOLPV
+        self._tolpv: Optional[float] = None
+
     @property
     def range_x(self) -> int | None:
         """Returns an instance of grid dimensions.
@@ -169,13 +173,20 @@ class Grid(ABC):
         """Returns the LGR module object associated with the grid."""
         return self._lgrs
 
+    @property
+    def tolpv(self) -> Optional[float]:
+        """Returns float value for TOLPV, if grid property is not loaded."""
+        self.load_grid_properties_if_not_loaded()
+        return self._tolpv
+
+    @classmethod
     @abstractmethod
-    def load_structured_grid_file(self, structure_grid_file: File,
+    def load_structured_grid_file(cls: type[Grid], structured_grid_file: File,
                                   model_unit_system: UnitSystem, lazy_loading: bool) -> Grid:
         """Loads in a structured grid file with all grid properties, and the array functions defined with 'FUNCTION'.
 
         Args:
-            structure_grid_file(File, lazy_loading: bool):The NexusFile representation of a structured grid file for
+            structured_grid_file(File, lazy_loading: bool):The NexusFile representation of a structured grid file for
             converting into a structured grid file class.
             lazy_loading(bool): If set to True, parts of the grid will only be loaded in
              when requested via properties on the object.

{ressimpy-2.5.3 → ressimpy-2.6.0}/ResSimpy/DataModelBaseClasses/Network.py

@@ -75,7 +75,7 @@ class Network(ABC):
                                                   x.node_out == connection_name and x.name != connection_name]
 
         # Add the in connection directly referenced by the connection itself if it is missing
-        if connection_to_check.node_in != connection_name:
+        if connection_to_check.node_in is not None and connection_to_check.node_in != connection_name:
             node_in_connection = self.connections.get_by_name(name=connection_to_check.node_in)
             if node_in_connection is not None and node_in_connection not in connections_directly_before_connection:
                 connections_directly_before_connection.append(node_in_connection)
@@ -84,7 +84,7 @@ class Network(ABC):
                                                  x.node_in == connection_name and x.name != connection_name]
 
         # Add the out connection directly referenced by the connection itself if it is missing
-        if connection_to_check.node_out != connection_name:
+        if connection_to_check.node_out is not None and connection_to_check.node_out != connection_name:
             node_out_connection = self.connections.get_by_name(name=connection_to_check.node_out)
             if node_out_connection is not None and node_out_connection not in connections_directly_after_connection:
                 connections_directly_after_connection.append(node_out_connection)

{ressimpy-2.5.3 → ressimpy-2.6.0}/ResSimpy/FileOperations/File.py

@@ -274,7 +274,7 @@ class File(FileBase):
             warnings.warn(f'PermissionError when trying to access file at {full_file_path}')
         except FileNotFoundError:
             # file not found, continue without filling out that information
-            warnings.warn(f'FileNotFoundError when trying to access file at {full_file_path}')
+            warnings.warn(f'No file found for: {full_file_path}')
         except KeyError:
             # Group or owner doesn't exist on this system, continue without filling out that information
             warnings.warn(f'Unable to find the group for the file at {full_file_path}')
@@ -345,6 +345,19 @@ class File(FileBase):
                                               last_modified=None)
             warnings.warn(UserWarning(f'No file found for: {full_file_path} while loading {origin}'))
             return nexus_file_class
+        except PermissionError:
+            # handle if a file can't be accessed
+            nexus_file_class = simulator_type(location=file_path,
+                                              include_locations=None,
+                                              origin=origin,
+                                              rootdir=rootdir,
+                                              include_objects=None,
+                                              file_content_as_list=None,
+                                              linked_user=None,
+                                              last_modified=None)
+            warnings.warn(UserWarning(
+                f'PermissionError when trying to access file at {full_file_path} while loading {origin}'))
+            return nexus_file_class
 
         # check last modified and user for the file
         user = File.get_pathlib_path_details(full_file_path)
@@ -403,8 +416,8 @@ class File(FileBase):
             if skip_arrays:
                 try:
                     inc_file_as_list = fo.load_file_as_list(inc_full_path)
-                except FileNotFoundError:
-                    # handle files not found - this is handled in an exception in the main loop
+                except (FileNotFoundError, PermissionError):
+                    # handle files not found or not accessible - this is handled in an exception in the main loop
                     pass
                 else:
                     all_numeric = False

{ressimpy-2.5.3 → ressimpy-2.6.0}/ResSimpy/Nexus/DataModels/Network/NexusActivationChange.py

@@ -2,6 +2,7 @@ from dataclasses import dataclass
 from typing import Optional
 
 from ResSimpy.DataModelBaseClasses.NetworkObject import NetworkObject
+from ResSimpy.Enums.UnitsEnum import UnitSystem
 from ResSimpy.Nexus.NexusEnums.ActivationChangeEnum import ActivationChangeEnum
 from ResSimpy.Nexus.NexusEnums.DateFormatEnum import DateFormat
 from ResSimpy.Units.AttributeMappings.BaseUnitMapping import BaseUnitMapping
@@ -27,7 +28,8 @@ class NexusActivationChange(NetworkObject):
         """
         self.change = change
         self.is_constraint_change = is_constraint_change
-        super().__init__(date_format=date_format, start_date=start_date, name=name, date=date)
+        super().__init__(date_format=date_format, start_date=start_date, name=name, date=date,
+                         unit_system=UnitSystem.METRIC)
 
     @staticmethod
     def get_keyword_mapping() -> dict[str, tuple[str, type]]:

{ressimpy-2.5.3 → ressimpy-2.6.0}/ResSimpy/Nexus/DataModels/NexusFile.py

@@ -152,7 +152,7 @@ class NexusFile(File):
                         include_file = obj
                         break
                     if obj.location is not None and \
-                            os.path.basename(obj.location) == os.path.basename(incfile_location):
+                            obj.location_in_including_file == incfile_location:
                         include_file = obj
                         break
 

{ressimpy-2.5.3 → ressimpy-2.6.0}/ResSimpy/Nexus/DataModels/StructuredGrid/NexusGrid.py

@@ -603,6 +603,18 @@ class NexusGrid(Grid):
                 self._range_y = int(second_value)
                 self._range_z = int(third_value)
 
+            # Load TOLPV scalar value
+            if nfo.check_token('TOLPV', line):
+                tolpv_value = fo.get_token_value('TOLPV', line, [line])
+                if tolpv_value is not None:
+                    self._tolpv = float(tolpv_value)
+
+            # Load TOLPV from CORTOL keyword third value when present.
+            if nfo.check_token('CORTOL', line):
+                cortol_values = line.split()
+                if len(cortol_values) >= 4:
+                    self._tolpv = float(cortol_values[3])
+
         # load the overs:
         if fo.value_in_file('OVER', file_as_list):
             self.__overs = NexusGrid.load_nexus_overs(file_as_list)
@@ -732,6 +744,10 @@ class NexusGrid(Grid):
             # Ensure resulting dataframe has uppercase column names
             df.columns = [col.upper() for col in df.columns]
 
+            # Ensure fault name case insensivity by making all fault names uppercase.
+            # This also ensures that when we check for MULTFL lines, we can do so in a case insensitive way.
+            df['NAME'] = df['NAME'].str.upper()
+
             # Check if any multfls have been used in grid file and update fault trans multipliers accordingly
             f_names = df['NAME'].unique()
             f_mults = [1.] * len(f_names)
@@ -741,6 +757,8 @@ class NexusGrid(Grid):
                     fname = str(nfo.get_expected_token_value(
                         'MULTFL', line, file_content_as_list,
                         custom_message=f'{line} does not have a fault name following MULTFL'))
+                    # Ensure fname is uppercase for case insensitivity
+                    fname = fname.upper()
                     if fname in df['NAME'].unique():
                         tmult = float(str(nfo.get_expected_token_value(
                             fname, line, file_content_as_list,

{ressimpy-2.5.3 → ressimpy-2.6.0}/ResSimpy/Nexus/NexusNetwork.py

@@ -5,13 +5,14 @@ connections, well connections, wellheads, wellbores, constraints and targets.
 """
 from __future__ import annotations
 
+import copy
 import re
 import warnings
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Literal
+from typing import TYPE_CHECKING, Any, Literal, TypeVar
 
 import ResSimpy.FileOperations.file_operations as fo
-from ResSimpy.DataModelBaseClasses.DataObjectMixin import DataObjectMixinDictType
+from ResSimpy.DataModelBaseClasses.DataObjectMixin import DataObjectMixinDictType, DataObjectMixin
 from ResSimpy.DataModelBaseClasses.Network import Network
 from ResSimpy.Enums.WellTypeEnum import WellType
 from ResSimpy.Nexus.DataModels.Network.NexusAction import NexusAction
@@ -56,6 +57,7 @@ from ResSimpy.Nexus.nexus_collect_tables import collect_all_tables_to_objects
 
 if TYPE_CHECKING:
     from ResSimpy.Nexus.NexusSimulator import NexusSimulator
+T = TypeVar('T', bound=DataObjectMixin)
 
 
 @dataclass(kw_only=True)
@@ -234,6 +236,56 @@ class NexusNetwork(Network):
 
         return loaded_procs
 
+    @staticmethod
+    def __combine_lists_into_one_timeline(list_1: list[T],
+                                          list_2: list[T]) -> list[T]:
+        """Combines two lists into one, ensuring that the objects are correctly ordered by iso_date.
+
+        Args:
+            list_1(list[DataObjectMixin]): The first list of objects to be combined
+            list_2(list[DataObjectMixin]): The second list of objects to be combined
+
+        Returns:
+            list[DataObjectMixin]: The combined list of both lists of objects in the correct order.
+        """
+        combined_list = []
+        list_1_copy = copy.deepcopy(list_1)
+        list_2_copy = copy.deepcopy(list_2)
+
+        # If either list is empty, simply return the other one.
+        if len(list_1_copy) == 0:
+            return list_2_copy
+        if len(list_2_copy) == 0:
+            return list_1_copy
+
+        # Loop through both lists, popping each entry as we add them to the combined list.
+        current_first_object = list_1_copy[0]
+        current_second_object = list_2_copy[0]
+
+        while len(list_1_copy) > 0 or len(list_2_copy) > 0:
+            if current_first_object.iso_date == current_second_object.iso_date:
+                warnings.warn('Multiple activation changes for the same timestamp of different types. Cannot guarantee '
+                              'the combined order matches the order in the original files')
+
+            if current_first_object.iso_date < current_second_object.iso_date:
+                combined_list.append(current_first_object)
+                list_1_copy.pop(0)
+                if len(list_1_copy) == 0:
+                    combined_list.extend(list_2_copy)
+                    break
+                else:
+                    current_first_object = list_1_copy[0]
+            else:
+                combined_list.append(current_second_object)
+                list_2_copy.pop(0)
+                if len(list_2_copy) == 0:
+                    combined_list.extend(list_1_copy)
+                    break
+                else:
+                    current_second_object = list_2_copy[0]
+
+        return combined_list
+
     def load(self) -> None:
         """Loads all the objects from the surface files in the Simulator class.
 
@@ -301,9 +353,15 @@ class NexusNetwork(Network):
             self.welllists._add_to_memory(type_check_lists(nexus_obj_dict.get('WELLLIST')))
             self.conlists._add_to_memory(type_check_lists(nexus_obj_dict.get('CONLIST')))
             self.nodelists._add_to_memory(type_check_lists(nexus_obj_dict.get('NODELIST')))
-            self.activation_changes._add_to_memory(type_check_lists(nexus_obj_dict.get('ACTIVATE_DEACTIVATE')))
-            constraint_activation_changes = self.__get_constraint_activation_changes(constraints=constraints)
-            self.activation_changes._add_to_memory(type_check_lists(constraint_activation_changes))
+
+            first_activation_changes = type_check_lists(nexus_obj_dict.get('ACTIVATE_DEACTIVATE'))
+            second_activation_changes = self.__get_constraint_activation_changes(constraints=constraints)
+            if (isinstance(first_activation_changes, list) and
+                    isinstance(second_activation_changes, list)):
+                combined_activation_changes = self.__combine_lists_into_one_timeline(list_1=first_activation_changes,
+                                                                                     list_2=second_activation_changes)
+                self.activation_changes._add_to_memory(type_check_lists(combined_activation_changes))
+
             self.stations._add_to_memory(type_check_lists(nexus_obj_dict.get('STATION')))
             self.drills._add_to_memory(type_check_lists(nexus_obj_dict.get('DRILL')))
             self.drill_sites._add_to_memory(type_check_lists(nexus_obj_dict.get('DRILLSITE')))

{ressimpy-2.5.3 → ressimpy-2.6.0}/ResSimpy/Nexus/NexusReporting.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 
 import warnings
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Optional
 
 import ResSimpy.Nexus.nexus_file_operations as nfo
 import ResSimpy.FileOperations.file_operations as fo
@@ -12,6 +12,7 @@ from ResSimpy.Enums.OutputType import OutputType
 from ResSimpy.Nexus.DataModels.NexusReportingRequests import NexusOutputRequest, NexusOutputContents
 from ResSimpy.Nexus.nexus_add_new_object_to_file import AddObjectOperations
 from ResSimpy.DataModelBaseClasses.Reporting import Reporting
+from ResSimpy.Nexus.NexusEnums.DateFormatEnum import DateFormat
 from ResSimpy.Time.ISODateTime import ISODateTime
 
 if TYPE_CHECKING:
@@ -145,7 +146,9 @@ class NexusReporting(Reporting):
                 ss_end_index = index
                 list_of_output_requests = self._get_output_request(file_as_list[ss_start_index:ss_end_index],
                                                                    date=current_date,
-                                                                   output_type=OutputType.SPREADSHEET)
+                                                                   output_type=OutputType.SPREADSHEET,
+                                                                   date_format=self.__model.date_format,
+                                                                   start_date=self.__model.start_date)
                 ss_output_requests.extend(list_of_output_requests)
 
             if nfo.check_token('OUTPUT', line):
@@ -154,7 +157,9 @@ class NexusReporting(Reporting):
                 array_end_index = index
                 list_of_output_requests = self._get_output_request(file_as_list[array_start_index:array_end_index],
                                                                    date=current_date,
-                                                                   output_type=OutputType.ARRAY)
+                                                                   output_type=OutputType.ARRAY,
+                                                                   date_format=self.__model.date_format,
+                                                                   start_date=self.__model.start_date)
                 array_output_requests.extend(list_of_output_requests)
 
             if nfo.check_token('SSOUT', line):
@@ -163,7 +168,9 @@ class NexusReporting(Reporting):
                 ss_end_index = index
                 list_of_output_contents = self._get_output_contents(file_as_list[ss_start_index:ss_end_index],
                                                                     date=current_date,
-                                                                    output_type=OutputType.SPREADSHEET)
+                                                                    output_type=OutputType.SPREADSHEET,
+                                                                    date_format=self.__model.date_format,
+                                                                    start_date=self.__model.start_date)
                 ss_output_contents.extend(list_of_output_contents)
 
             if nfo.check_token('MAPOUT', line) or nfo.check_token('ARRAYOUT', line):
@@ -172,7 +179,9 @@ class NexusReporting(Reporting):
                 ss_end_index = index
                 list_of_output_contents = self._get_output_contents(file_as_list[ss_start_index:ss_end_index],
                                                                     date=current_date,
-                                                                    output_type=OutputType.ARRAY)
+                                                                    output_type=OutputType.ARRAY,
+                                                                    date_format=self.__model.date_format,
+                                                                    start_date=self.__model.start_date)
                 array_output_contents.extend(list_of_output_contents)
 
         self.__ss_output_requests = ss_output_requests
@@ -182,50 +191,69 @@ class NexusReporting(Reporting):
         self.__load_status = True
 
     @staticmethod
-    def _get_output_request(table_file_as_list: list[str], date: str, output_type: OutputType) \
-            -> list[NexusOutputRequest]:
+    def _get_output_request(table_file_as_list: list[str], date: str, output_type: OutputType,
+                            date_format: Optional[DateFormat] = None,
+                            start_date: Optional[str] = None) -> list[NexusOutputRequest]:
         """Gets the output objects from the runcontrol file.
 
         Args:
             table_file_as_list (list[str]): The table file as a list of strings
             date (str): The date of the output
             output_type (OutputType): The output type as an Enum
+            date_format (Optional[DateFormat]): The date format of the model.
+            start_date (Optional[str]): The start date of the model (required if dates are numeric).
         """
         output_request_with_number = ['DT', 'DTTOL', 'FREQ', 'TIMESTEP']
 
-        resulting_output_requests: list[NexusOutputRequest] = []
+        # Flatten all tokens across every line so that keyword/frequency pairs
+        # split across lines (e.g. "MAPS\nTNEXT") are handled correctly.
+        all_tokens: list[str] = []
         for line in table_file_as_list:
+            all_tokens.extend(fo.split_line(line))
+
+        resulting_output_requests: list[NexusOutputRequest] = []
+        i = 0
+        while i < len(all_tokens):
             number_defined_float: None | float = None
-            element = nfo.get_next_value(start_line_index=0, file_as_list=[line])
-            if element is None or element == '':
-                continue
-            frequency = nfo.get_expected_token_value(element, token_line=line,
-                                                     file_list=[line])
+            element = all_tokens[i]
+            i += 1
+            if i >= len(all_tokens):
+                warnings.warn(f'No frequency found for output request: {element}')
+                break
+            frequency = all_tokens[i]
+            i += 1
             if frequency in output_request_with_number:
-                number_defined = nfo.get_expected_token_value(frequency, token_line=line,
-                                                              file_list=[line])
-                try:
-                    number_defined_float = float(number_defined)
-                except ValueError:
-                    warnings.warn(f'Unable to convert output request number to float: {number_defined}')
-                    number_defined_float = None
+                if i >= len(all_tokens):
+                    warnings.warn(f'No number found after {frequency} for output request: {element}')
+                else:
+                    number_defined = all_tokens[i]
+                    i += 1
+                    try:
+                        number_defined_float = float(number_defined)
+                    except ValueError:
+                        warnings.warn(f'Unable to convert output request number to float: {number_defined}')
+                        number_defined_float = None
 
             frequency_enum = FrequencyEnum[frequency]
             output_request = NexusOutputRequest(date=date, output=element, output_frequency=frequency_enum,
-                                                output_frequency_number=number_defined_float, output_type=output_type)
+                                                output_frequency_number=number_defined_float, output_type=output_type,
+                                                date_format=date_format, start_date=start_date)
             resulting_output_requests.append(output_request)
 
         return resulting_output_requests
 
     @staticmethod
-    def _get_output_contents(table_file_as_list: list[str], date: str, output_type: OutputType) \
-            -> list[NexusOutputContents]:
+    def _get_output_contents(table_file_as_list: list[str], date: str, output_type: OutputType,
+                             date_format: Optional[DateFormat] = None,
+                             start_date: Optional[str] = None) -> list[NexusOutputContents]:
         """Gets the output contents from a table.
 
         Args:
             table_file_as_list (list[str]): The table file as a list of strings
             date (str): The date of the output
             output_type (OutputType): The output type as an Enum
+            date_format (Optional[DateFormat]): The date format of the model.
+            start_date (Optional[str]): The start date of the model (required if dates are numeric).
         """
         resulting_output_contents: list[NexusOutputContents] = []
         for line in table_file_as_list:
@@ -242,8 +270,8 @@ class NexusReporting(Reporting):
                     output_contents.append(value)
 
             output_contents_obj = NexusOutputContents(date=date, output_contents=output_contents,
-                                                      output_type=output_type,
-                                                      output=element)
+                                                      output_type=output_type, output=element,
+                                                      _date_format=date_format, _start_date=start_date)
             resulting_output_contents.append(output_contents_obj)
 
         return resulting_output_contents

{ressimpy-2.5.3 → ressimpy-2.6.0}/ResSimpy/Nexus/structured_grid_operations.py

@@ -481,10 +481,11 @@ class StructuredGridOperations:
                 if len(mod_table.columns) == 7:
                     mod_table.columns = ['i1', 'i2', 'j1', 'j2', 'k1', 'k2', '#v']
                 elif len(mod_table.columns) == 8:
-                    # clean nan's when there is a mix of 7 length and 8 length columns
+                    # clean nans when there is a mix of 7 length and 8 length columns
                     mod_table[7] = mod_table[7].convert_dtypes().astype(str)
                     mod_table[7] = mod_table[7].replace('nan', '')
                     mod_table[7] = mod_table[7].replace('<NA>', '')
+                    mod_table[7] = mod_table[7].fillna('')
                     # Put the last two columns together and drop them to make the #v column
                     mod_table[8] = mod_table[6].astype(str) + mod_table[7].astype(str)
                     mod_table = mod_table.drop([6, 7], axis=1)

{ressimpy-2.5.3 → ressimpy-2.6.0}/ResSimpy/__init__.py

@@ -11,12 +11,21 @@
     Enums
 """
 
-__version__ = "2.5.3"  # Set at build time
+__version__ = "2.6.0"  # Set at build time
 
 from ResSimpy.Nexus.NexusSimulator import NexusSimulator
 from ResSimpy.OpenGoSim.OpenGoSimSimulator import OpenGoSimSimulator
 
+# Useful regularly used objects
+from ResSimpy.Time.ISODateTime import ISODateTime
+from ResSimpy.Enums.UnitsEnum import UnitSystem
+from ResSimpy.Nexus.NexusEnums.DateFormatEnum import DateFormat
+
+
 __all__ = [
     "NexusSimulator",
     "OpenGoSimSimulator",
+    "ISODateTime",
+    "UnitSystem",
+    "DateFormat",
    ]

{ressimpy-2.5.3 → ressimpy-2.6.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ResSimpy"
-version = "2.5.3" # Set at build time
+version = "2.6.0" # Set at build time
 description = "A Python library for working with Reservoir Simulator Models."
 authors = ["BP"]
 readme = "README.md"
@@ -11,6 +11,8 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Development Status :: 5 - Production/Stable",
     "Topic :: Scientific/Engineering",
     "Topic :: System :: Filesystems",
@@ -21,20 +23,27 @@ packages = [
 ]
 
 [tool.poetry.dependencies]
-python = ">=3.10, <3.13"
-numpy = ">=1.23.4, <2"
-pandas = ">=1.5.0, <2.3"
-typing-extensions = "^4.12"
+python = ">=3.10, <3.15"
+numpy = [
+      { version = ">=2.2, <2.3",  python = "<3.11" },
+      { version = ">=2.3, <2.6",    python = ">=3.11" },
+  ]
+pandas = [
+      { version = ">=2.3,<3",      python = "<3.11" },
+      { version = ">=3.0,<3.0.4",  python = ">=3.11" },
+  ]
+
+typing-extensions = "^4.15"
 
 [tool.poetry.group.dev.dependencies]
 pytest-mock = "^3.15"
-pytest = "^9.0"
-coverage = "^6.5"
-flake8 = "^6"
-mypy = "^1.2"
-pycodestyle = "^2.9.1"
-pytest-cov = "^4.0.0"
-ruff = "0.6.5"
+pytest = "^9.1"
+coverage = "^7.14"
+flake8 = "^7.3"
+mypy = "^2.1"
+pycodestyle = "^2.14"
+pytest-cov = "^7.1"
+ruff = "0.15.18"
 
 [tool.poetry-dynamic-versioning]
 enable = false