pthelma 1.1.0__cp312-cp312-musllinux_1_2_x86_64.whl → 2.0.0__cp312-cp312-musllinux_1_2_x86_64.whl

enhydris_cache/cli.py

@@ -2,7 +2,6 @@ import configparser
 import datetime as dt
 import logging
 import os
-import sys
 import traceback
 
 import click
@@ -81,7 +80,6 @@ class AppConfig:
         try:
             self._parse_config()
         except (OSError, configparser.Error) as e:
-            sys.stderr.write(str(e))
             raise click.ClickException(str(e))
 
     def _parse_config(self):

evaporation/cli.py

@@ -2,7 +2,6 @@ import configparser
 import datetime as dt
 import logging
 import os
-import sys
 import traceback
 from glob import glob
 from io import StringIO
@@ -100,7 +99,6 @@ class AppConfig:
         try:
             self._parse_config()
         except (OSError, configparser.Error) as e:
-            sys.stderr.write(str(e))
             raise click.ClickException(str(e))
 
     def _parse_config(self):
@@ -155,10 +153,10 @@ class AppConfig:
         self.time_step = s
 
     def _check_time_step(self, s):
-        if s not in ("D", "H"):
+        if s not in ("D", "h"):
             raise WrongValueError(
                 '"{}" is not an appropriate time step; in this version of '
-                "vaporize, the step must be either D or H.".format(s)
+                "vaporize, the step must be either D or h.".format(s)
             )
 
     def _parse_unit_converters(self):
@@ -412,11 +410,11 @@ class ProcessAtPoint:
         self.pet.unit = "mm"
         self.pet.timezone = self.timezone
         self.pet.variable = "Potential Evapotranspiration"
-        self.pet.precision = 2 if self.config.time_step == "H" else 1
+        self.pet.precision = 2 if self.config.time_step == "h" else 1
         self.pet.location = self.location
 
     def _determine_variables_to_use_in_calculation(self):
-        if self.config.time_step == "H":
+        if self.config.time_step == "h":
             vars = ["temperature", "humidity", "wind_speed", "solar_radiation"]
             if "pressure" in self.input_timeseries:
                 vars.append("pressure")
@@ -571,7 +569,7 @@ class ProcessSpatial:
             self._read_input_geofile(var, timestamp)
 
     def _get_variables(self):
-        if self.config.time_step == "H":
+        if self.config.time_step == "h":
             return {
                 "temperature",
                 "humidity",

evaporation/evaporation.py

@@ -45,7 +45,7 @@ class PenmanMonteith(object):
         self.unit_converters = unit_converters
 
     def calculate(self, **kwargs):
-        if self.time_step == "H":
+        if self.time_step == "h":
             return self.calculate_hourly(**kwargs)
         elif self.time_step == "D":
             return self.calculate_daily(**kwargs)

haggregate/haggregate.py

@@ -106,7 +106,7 @@ class SourceTimeseries(HTimeseries):
                 )
         except ValueError:
             raise CannotInferFrequency()
-        first_timestamp = (current_range[0] - pd.Timedelta("1S")).floor(target_step)
+        first_timestamp = (current_range[0] - pd.Timedelta("1s")).floor(target_step)
         end_timestamp = current_range[-1].ceil(target_step)
         new_range = pd.date_range(first_timestamp, end_timestamp, freq=self.freq)
         self.data = self.data.reindex(new_range)
@@ -116,8 +116,8 @@ class AggregatedTimeseries(HTimeseries):
     def set_metadata(self, source_timeseries):
         for attr in attrs:
             setattr(self, attr, getattr(source_timeseries, attr, None))
-        if self.time_step not in ("1H", "1D"):
-            raise AggregateError("The target step can currently only be 1H or 1D")
+        if self.time_step not in ("1h", "1D"):
+            raise AggregateError("The target step can currently only be 1h or 1D")
         if hasattr(source_timeseries, "title"):
             self.title = "Aggregated " + source_timeseries.title
         if hasattr(source_timeseries, "comment"):
@@ -140,7 +140,7 @@ class AggregatedTimeseries(HTimeseries):
 
 
 def _get_offset_in_minutes(timestamp_offset):
-    m = re.match(r"(-?)(\d*)(T|min)$", timestamp_offset)
+    m = re.match(r"(-?)(\d*)min$", timestamp_offset)
     if not m:
         raise AggregateError(
             "The target timestamp offset can currently only be a number of minutes "