HydPy 6.3.1__tar.gz → 6.3.2__tar.gz

{hydpy-6.3.1 → hydpy-6.3.2}/HydPy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: HydPy
-Version: 6.3.1
+Version: 6.3.2
 Summary: A framework for the development and application of hydrological models.
 Home-page: https://github.com/hydpy-dev/hydpy
 Author: HydPy Developers

{hydpy-6.3.1 → hydpy-6.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: HydPy
-Version: 6.3.1
+Version: 6.3.2
 Summary: A framework for the development and application of hydrological models.
 Home-page: https://github.com/hydpy-dev/hydpy
 Author: HydPy Developers

{hydpy-6.3.1 → hydpy-6.3.2}/hydpy/__init__.py

@@ -116,7 +116,7 @@ from hydpy.exe.replacetools import xml_replace
 from hydpy.exe.servertools import await_server, start_server
 from hydpy.exe.xmltools import XMLInterface, run_simulation, xml_validate
 
-__version__ = "6.3.1"
+__version__ = "6.3.2"
 
 pub.options = optiontools.Options()
 pub.indexer = indextools.Indexer()

{hydpy-6.3.1 → hydpy-6.3.2}/hydpy/auxs/armatools.py

@@ -905,7 +905,7 @@ far.
         result = numpy.linalg.lstsq(
             self.get_a(values, ar_order), self.get_b(values, ar_order), rcond=-1
         )
-        self.ar_coefs = cast(VectorFloat, result[0])
+        self.ar_coefs = result[0]
         residuals = result[1]
         if len(residuals) == 1:
             self._rel_rmse = numpy.sqrt(residuals[0]) / numpy.sum(values)

{hydpy-6.3.1 → hydpy-6.3.2}/hydpy/core/devicetools.py

@@ -2689,7 +2689,7 @@ occurred: Attribute timegrids of module `pub` is not defined at the moment.
                 ps.plot(ax=pyplot.gca(), **kwargs)
             pyplot.legend()
             if not focus:
-                pyplot.ylim((0.0, None))
+                pyplot.ylim((0.0, None))  # type: ignore[arg-type]
             if pyplot.get_fignums():
                 pyplot.ylabel(self._ylabel)
             return pyplot.gcf()
@@ -2770,8 +2770,7 @@ occurred: Attribute timegrids of module `pub` is not defined at the moment.
         ...
         ValueError: While trying to plot the duration curves of the sequences obs and \
 sim of node `dill_assl` for the period `1996-01-01 00:00:00` to `1996-06-01 00:00:00`, \
-the following error occurred: '.' is not a valid value for ls; supported values are \
-'-', '--', '-.', ':', 'None', ' ', '', 'solid', 'dashed', 'dashdot', 'dotted'
+the following error occurred: '.' is not a valid value for ls. Did you mean: '-.'?
         """
 
         t = TypeVar("t", str, int)
@@ -3763,7 +3762,7 @@ class `Element` is deprecated.  Use method `prepare_model` instead.
         lines = [l for l in pyplot.legend().get_lines() if l.get_label() != "None"]
         pyplot.legend(handles=lines)
         if not focus:
-            pyplot.ylim((0.0, None))
+            pyplot.ylim((0.0, None))  # type: ignore[arg-type]
         return pyplot.gcf()
 
     def _query_iosequences(

{hydpy-6.3.1 → hydpy-6.3.2}/hydpy/core/filetools.py

@@ -164,10 +164,7 @@ class _CurrentDirContext(str):
     def __init__(self, manager: FileManager, property_: _CurrentDirProperty, /) -> None:
         self._manager = manager
         self._property = (property_,)
-        if (value := property_.manager2value.get(manager)) is None:
-            self._old_value = manager.DEFAULTDIR
-        else:
-            self._old_value = value
+        self._old_value = property_.manager2value.get(manager)
         self._new_value = None
         self._is_called = False
         self._is_entered = False

{hydpy-6.3.1 → hydpy-6.3.2}/hydpy/core/masktools.py

@@ -17,7 +17,7 @@ if TYPE_CHECKING:
     from hydpy.core import parametertools
 
 
-class BaseMask(NDArrayBool):
+class BaseMask(numpy.ndarray[Any, numpy.dtype[numpy.bool_]]):
     """Base class for defining |CustomMask| and |DefaultMask| classes."""
 
     name: str

{hydpy-6.3.1 → hydpy-6.3.2}/hydpy/core/objecttools.py

@@ -29,9 +29,7 @@ if TYPE_CHECKING:
 
 _builtinnames = set(dir(builtins))
 
-ReprArg: TypeAlias = Union[
-    numbers.Number, Iterable[numbers.Number], Iterable[Iterable[numbers.Number]]
-]
+ReprArg: TypeAlias = Union[float, Iterable[float], Iterable[Iterable[float]]]
 
 
 def classname(self: object) -> str:
@@ -901,12 +899,12 @@ def repr_numbers(values: ReprArg) -> str:
 
     Note that the returned string is not wrapped.
     """
-    if isinstance(values, numbers.Number):
+    if isinstance(values, float):
         return repr_(values)
     result = []
     ndim = 1
     for value in values:
-        if isinstance(value, numbers.Number):
+        if isinstance(value, float):
             result.append(repr_(value))
         else:
             result.append(", ".join(repr_(v) for v in value))

{hydpy-6.3.1 → hydpy-6.3.2}/hydpy/core/parametertools.py

@@ -2591,12 +2591,12 @@ class SeasonalParameter(Parameter):
     Pairs of |TOY| objects and |float| values define the seasonal pattern.  One can
     assign them all at once via keyword arguments:
 
-    >>> par(_1=2., _7_1=4., _3_1_0_0_0=5.)
+    >>> par(_1=2.0, _7_1=4.0, _3_1_0_0_0=5.0)
 
     Note that all keywords in the call above are proper |TOY| initialisation arguments.
     Misspelt keywords result in error messages like the following:
 
-    >>> Par(None)(_a=1.)
+    >>> Par(None)(_a=1.0)
     Traceback (most recent call last):
     ...
     ValueError: While trying to define the seasonal parameter value `par` of element \
@@ -2620,7 +2620,7 @@ given for property `month` cannot be converted to `int`.
     >>> par.toy_1_1_0_0_0
     2.0
     >>> del par.toy_1_1_0_0_0
-    >>> par.toy_2_1_0_0_0 = 2.
+    >>> par.toy_2_1_0_0_0 = 2.0
     >>> par
     par(toy_2_1_0_0_0=2.0,
         toy_3_1_0_0_0=5.0,
@@ -2655,7 +2655,7 @@ attribute nor does it handle a "time of year" named `2_1`.
 
     New values are checked to be compatible with the predefined shape:
 
-    >>> par.toy_1_1_0_0_0 = [1., 2.]   # doctest: +ELLIPSIS
+    >>> par.toy_1_1_0_0_0 = [1.0, 2.0]   # doctest: +ELLIPSIS
     Traceback (most recent call last):
     ...
     TypeError: While trying to add a new or change an existing toy-value pair for the \
@@ -2664,7 +2664,7 @@ argument must be a string or a... number...
     >>> par = Par(None)
     >>> par.NDIM = 2
     >>> par.shape = (None, 3)
-    >>> par.toy_1_1_0_0_0 = [1., 2.]
+    >>> par.toy_1_1_0_0_0 = [1.0, 2.0]
     Traceback (most recent call last):
     ...
     ValueError: While trying to add a new or change an existing toy-value pair for \
@@ -3159,8 +3159,8 @@ Using the latter without modification might result in inconsistencies.
             self.refresh()
 
     def __repr__(self) -> str:
-        def _assignrepr(value_, prefix_):
-            if self.NDIM == 1:
+        def _assignrepr(value_: float | NDArrayFloat, prefix_: str) -> str:
+            if isinstance(value_, float):
                 return objecttools.assignrepr_value(value_, prefix_)
             return objecttools.assignrepr_list(value_, prefix_, width=79)
 

{hydpy-6.3.1 → hydpy-6.3.2}/hydpy/core/sequencetools.py

@@ -367,7 +367,7 @@ class FastAccessNodeSequence(FastAccessIOSequence):
             self._reset_obsdata = False
 
 
-class InfoArray(NDArrayFloat):
+class InfoArray(numpy.ndarray[Any, numpy.dtype[numpy.float64]]):
     """|numpy| |numpy.ndarray| subclass with an additional attribute describing the
     (potential) aggregation of the handled data.
 

{hydpy-6.3.1 → hydpy-6.3.2}/hydpy/core/testtools.py

@@ -414,7 +414,7 @@ class Test:
         """To be implemented by the subclasses of |Test|."""
 
     @abc.abstractmethod
-    def get_output_array(self, parseqs):
+    def get_output_array(self, parseqs: Never) -> NDArrayFloat:
         """To be implemented by the subclasses of |Test|."""
 
     @property
@@ -564,11 +564,16 @@ class IntegrationTest(Test):
     nodes: devicetools.Devices[devicetools.Node]
     parseqs: tuple[sequencetools.IOSequence, ...]
 
+    _dateformat: str | None = None
+
     def __init__(
         self,
         element: devicetools.Element | None = None,
         seqs: tuple[sequencetools.IOSequence, ...] | None = None,
-        inits=None,
+        inits: (
+            Sequence[tuple[sequencetools.ConditionSequence, float | NDArrayFloat]]
+            | None
+        ) = None,
     ) -> None:
         """Prepare the element and its nodes, put them into a HydPy object, and make
         their sequences ready for use for integration testing."""
@@ -696,8 +701,7 @@ standard library for for further information.
         >>> tester.dateformat
         '%x'
         """
-        dateformat = vars(self).get("dateformat")
-        if dateformat is None:
+        if (dateformat := self._dateformat) is None:
             return timetools.Date.formatstrings["iso2"]
         return dateformat
 
@@ -711,9 +715,9 @@ standard library for for further information.
                 f"for `datetime` objects.  Please read the documentation on module "
                 f"datetime of the Python standard library for for further information."
             ) from exc
-        vars(self)["dateformat"] = dateformat
+        self._dateformat = dateformat
 
-    def get_output_array(self, parseqs: sequencetools.IOSequence):
+    def get_output_array(self, parseqs: sequencetools.IOSequence) -> NDArrayFloat:
         """Return the array containing the output results of the given sequence."""
         return parseqs.series
 
@@ -993,7 +997,15 @@ class UnitTest(Test):
     """Stores arrays with the resulting values of parameters and/or
     sequences of each new experiment."""
 
-    def __init__(self, model, method, *, first_example=1, last_example=1, parseqs=None):
+    def __init__(
+        self,
+        model: modeltools.Model,
+        method: modeltools.Method,
+        *,
+        first_example: int = 1,
+        last_example: int = 1,
+        parseqs: tuple[variabletools.Variable],
+    ) -> None:
         del self.inits
         del self.nexts
         del self.results
@@ -1008,21 +1020,23 @@ class UnitTest(Test):
         self.prepare_output_arrays()
 
     @property
-    def nmb_examples(self):
+    def nmb_examples(self) -> int:
         """The number of examples to be calculated."""
         return self.last_example_calc - self.first_example_calc + 1
 
     @property
-    def idx0(self):
+    def idx0(self) -> int:
         """The first index of the examples selected for printing."""
         return self.first_example_plot - self.first_example_calc
 
     @property
-    def idx1(self):
+    def idx1(self) -> int:
         """The last index of the examples selected for printing."""
         return self.nmb_examples - (self.last_example_calc - self.last_example_plot)
 
-    def __call__(self, first_example=None, last_example=None) -> None:
+    def __call__(
+        self, first_example: int | None = None, last_example: int | None = None
+    ) -> None:
         if first_example is None:
             self.first_example_plot = self.first_example_calc
         else:
@@ -1038,18 +1052,18 @@ class UnitTest(Test):
             self._update_outputs(idx)
         self.print_table(self.idx0, self.idx1)
 
-    def get_output_array(self, parseqs):
+    def get_output_array(self, parseqs: variabletools.Variable) -> NDArrayFloat:
         """Return the array containing the output results of the given
         parameter or sequence."""
         return getattr(self.results, parseqs.name)
 
     @property
-    def raw_first_col_strings(self):
+    def raw_first_col_strings(self) -> tuple[str, ...]:
         """The raw integer strings of the first column, except the header."""
-        return [
+        return tuple(
             str(example)
             for example in range(self.first_example_plot, self.last_example_plot + 1)
-        ]
+        )
 
     def memorise_inits(self) -> None:
         """Memorise all initial conditions."""
@@ -1075,14 +1089,14 @@ class UnitTest(Test):
             if inits is not None:
                 parseq(inits)
 
-    def _update_inputs(self, idx) -> None:
+    def _update_inputs(self, idx: int) -> None:
         """Update the actual values with the |UnitTest.nexts| data of
         the given index."""
         for parseq in self.parseqs:
             if hasattr(self.nexts, parseq.name):
                 parseq(getattr(self.nexts, parseq.name)[idx])
 
-    def _update_outputs(self, idx) -> None:
+    def _update_outputs(self, idx: int) -> None:
         """Update the |UnitTest.results| data with the actual values of
         the given index."""
         for parseq in self.parseqs:
@@ -1099,7 +1113,7 @@ class _Open:
 
     texts: list[str]
 
-    def __init__(self, path, mode, *args, **kwargs) -> None:
+    def __init__(self, path: str, mode: str, *args: Any, **kwargs: Any) -> None:
         # pylint: disable=unused-argument
         # all further positional and keyword arguments are ignored.
         self.path = path.replace(os.sep, "/")
@@ -1107,11 +1121,16 @@ class _Open:
         self.texts = []
         self.entered = False
 
-    def __enter__(self):
+    def __enter__(self) -> Self:
         self.entered = True
         return self
 
-    def __exit__(self, exception, message, traceback_):
+    def __exit__(
+        self,
+        exception_type: type[BaseException],
+        exception_value: BaseException,
+        traceback_: types.TracebackType,
+    ) -> None:
         self.close()
 
     def read(self) -> NoReturn:
@@ -1126,11 +1145,11 @@ class _Open:
         """Raise a |NotImplementedError| in any case."""
         raise NotImplementedError(self.__readingerror)
 
-    def write(self, text) -> None:
+    def write(self, text: str) -> None:
         """Replace the `write` method of file objects."""
         self.texts.append(text)
 
-    def writelines(self, lines) -> None:
+    def writelines(self, lines: Iterable[str]) -> None:
         """Replace the `writelines` method of file objects."""
         self.texts.extend(lines)
 
@@ -1213,11 +1232,16 @@ for further information.
     def __init__(self) -> None:
         self.open = builtins.open
 
-    def __enter__(self):
+    def __enter__(self) -> Self:
         builtins.open = _Open  # type: ignore[assignment]
         return self
 
-    def __exit__(self, exception, message, traceback_) -> None:
+    def __exit__(
+        self,
+        exception_type: type[BaseException],
+        exception_value: BaseException,
+        traceback_: types.TracebackType,
+    ) -> None:
         builtins.open = self.open
 
 

{hydpy-6.3.1 → hydpy-6.3.2}/hydpy/core/typingtools.py

@@ -73,9 +73,7 @@ Sequence1: TypeAlias = Union[T_inv, Sequence[T_inv]]
 Sequence2: TypeAlias = Union[T1, T2, Sequence[T1 | T2]]
 Sequence3: TypeAlias = Union[T1, T2, T3, Sequence[T1 | T2 | T3]]
 
-Float_co = TypeVar("Float_co", covariant=True)
-Float1 = TypeVar("Float1", bound=float)
-Float2 = TypeVar("Float2", bound=float)
+Float = TypeVar("Float", bound=float)
 
 Scalar = TypeVar(
     "Scalar",
@@ -301,6 +299,7 @@ __all__ = [
     "Collection3",
     "DeployMode",
     "Final",
+    "Float",
     "Generator",
     "Generic",
     "get_type_hints",

{hydpy-6.3.1 → hydpy-6.3.2}/hydpy/core/variabletools.py

@@ -453,7 +453,7 @@ def _trim_int_nd(self: Variable, lower: TrimHook, upper: TrimHook) -> bool:
         self[idxs] = INT_NAN
 
 
-def get_tolerance(values):
+def get_tolerance(values: float | NDArrayFloat) -> float | NDArrayFloat:
     """Return some "numerical accuracy" to be expected for the given floating-point
     value(s).
 
@@ -470,15 +470,17 @@ def get_tolerance(values):
     ...     numpy.asarray([1.0, numpy.inf, 2.0, -numpy.inf])), 16)
     0.000000000000001, 0.0, 0.000000000000002, 0.0
     """
-    tolerance = numpy.abs(values * 1e-15)
-    if hasattr(tolerance, "__setitem__"):
+    if isinstance(values, float):
+        tolerance: float | NDArrayFloat = math.fabs(values * 1e-15)
+        if math.isinf(tolerance):
+            tolerance = 0.0
+    else:
+        tolerance = numpy.abs(values * 1e-15)
         tolerance[numpy.isinf(tolerance)] = 0.0
-    elif math.isinf(tolerance):
-        tolerance = 0.0
     return tolerance
 
 
-def _warn_trim(self, oldvalue, newvalue):
+def _warn_trim(self, oldvalue: ArrayFloat, newvalue: ArrayFloat) -> None:
     if hydpy.pub.options.warntrim:
         warnings.warn(
             f"For variable {objecttools.devicephrase(self)} at least one value "
@@ -1522,7 +1524,7 @@ as `var` can only be `()`, but `(2,)` is given.
         if initflag:
             self._valueready = True
 
-    def _raise_wrongshape(self, shape):
+    def _raise_wrongshape(self, shape: int | tuple[int, ...]) -> NoReturn:
         raise ValueError(
             f"The shape information of 0-dimensional variables "
             f"as {objecttools.devicephrase(self)} can only be `()`, "
@@ -2212,12 +2214,12 @@ has been determined, which is not a submask of `Soil([ True,  True, False])`.
             )
         )
 
-    def _typeconversion(self, type_):
+    def _typeconversion(self, type_: type[Float]) -> Float:
         if self.NDIM:
             raise TypeError(
                 f"The variable {objecttools.devicephrase(self)} is "
-                f"{self.NDIM}-dimensional and thus cannot be converted "
-                f"to a scalar {type_.__name__} value."
+                f"{self.NDIM}-dimensional and thus cannot be converted to a scalar "
+                f"{type_.__name__} value."
             )
         return type_(self.value)
 

{hydpy-6.3.1 → hydpy-6.3.2}/hydpy/docs/sphinx/conf.py

@@ -201,7 +201,7 @@ copyright = f"2013-{datetime.datetime.now().year}, HydPy Developers"
 # The short X.Y version.
 version = "6.3"
 # The full version, including alpha/beta/rc tags.
-release = "6.3.1"
+release = "6.3.2"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

{hydpy-6.3.1 → hydpy-6.3.2}/hydpy/models/arma/arma_model.py

@@ -63,8 +63,7 @@ class Calc_QPIn_V1(modeltools.Method):
         >>> test = UnitTest(
         ...     model, model.calc_qpin_v1,
         ...     first_example=8, last_example=10,
-        ...                 parseqs=(fluxes.qin,
-        ...                          fluxes.qpin))
+        ...     parseqs=(fluxes.qin, fluxes.qpin))
         >>> test.nexts.qin = -1.0, 0.0, 12.0
         >>> test()
         | ex. |  qin | qpin |

{hydpy-6.3.1 → hydpy-6.3.2}/hydpy/tests/run_doctests.py

@@ -173,12 +173,10 @@ def main(  # pylint: disable=too-many-branches
                         warnings.filterwarnings(
                             action="ignore",
                             category=DeprecationWarning,
-                            message="`np.bool`",
-                        )
-                        warnings.filterwarnings(
-                            action="ignore",
-                            category=DeprecationWarning,
-                            message="datetime.datetime.utcfromtimestamp",
+                            message=(
+                                "Setting the shape on a NumPy array has been "
+                                "deprecated in NumPy 2.5."
+                            ),
                         )
                         runner = unittest.TextTestRunner(stream=file_)
                         result = runner.run(suite)

{hydpy-6.3.1 → hydpy-6.3.2}/setup.py

@@ -22,7 +22,7 @@ extension_modules = [
 
 setuptools.setup(
     name="HydPy",
-    version="6.3.1",
+    version="6.3.2",
     description="A framework for the development and application of hydrological "
     "models.",
     long_description=long_description,