pthelma 1.1.0__cp311-cp311-win32.whl → 2.1.0__cp311-cp311-win32.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

@@ -75,8 +75,8 @@ class Aggregation:
     def get_result_flags(self):
         max_count = int(pd.Timedelta(self.result.time_step) / self.source.freq)
         values_count = self.resampler.count()
-        self.result.data["flags"] = (values_count < max_count).apply(
-            lambda x: self.missing_flag if x else ""
+        self.result.data["flags"] = (max_count - values_count).apply(
+            lambda x: self.missing_flag.format(x) if x else ""
         )
 
 
@@ -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 "

hspatial/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,7 @@ class App:
                         0, iso8601.parse_date(datestring, default_timezone=timezone)
                     )
                 except iso8601.ParseError as e:
-                    raise iso8601.ParseError(
+                    raise click.ClickException(
                         str(e)
                         + " (file {}, {} lines from the end)".format(filename, i + 1)
                     )
@@ -146,7 +145,7 @@ class App:
         """
         Determine date_fmt based on time series time step.
         """
-        if self._time_step.endswith("min") or self._time_step.endswith("H"):
+        if self._time_step.endswith("min") or self._time_step.endswith("h"):
             return "%Y-%m-%d %H:%M%z"
         elif self._time_step.endswith("D"):
             return "%Y-%m-%d"
@@ -221,7 +220,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):

pthelma/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.1.0'
-__version_tuple__ = version_tuple = (1, 1, 0)
+__version__ = version = '2.1.0'
+__version_tuple__ = version_tuple = (2, 1, 0)

{pthelma-1.1.0.dist-info → pthelma-2.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pthelma
-Version: 1.1.0
+Version: 2.1.0
 Summary: Utilities for hydrological and meteorological time series processing
 Author-email: Antonis Christofides <antonis@antonischristofides.com>
 Maintainer-email: Antonis Christofides <antonis@antonischristofides.com>

{pthelma-1.1.0.dist-info → pthelma-2.1.0.dist-info}/RECORD

@@ -1,30 +1,30 @@
 enhydris_api_client/__init__.py,sha256=TQQD2zgSAl-7eXOOHjgvHEqMW1D3GSmf9nI9cmR31c8,9592
 enhydris_cache/__init__.py,sha256=n3mAFeXUINSGpRkO-ZL1tkxyAuEabnMdlNPpmKur0AU,157
-enhydris_cache/cli.py,sha256=aqlcp0zXVNSmMAVfjVz_2ri6V7pHiSRPthO4y1LCdf4,4793
+enhydris_cache/cli.py,sha256=BEFBYdrfdJbEUyeY87BLWw7igKlfB2qzkpopPZrAIUQ,4743
 enhydris_cache/enhydris_cache.py,sha256=Mvpk2JxF6hSgk0qmGWEVFjIAoehFbdK41LyBJjAYhZc,2691
 evaporation/__init__.py,sha256=ekZNT_-GEt1lDmwbX_RIaOvHSRjX05iVWeupaxZV75Y,126
-evaporation/cli.py,sha256=4HdusE0Trt81HsNlClvlrAu-493GtGa6bn_KuV4opzs,28442
-evaporation/evaporation.py,sha256=twTkFsuI5QRcof1XbnOG5vhnEMgrA2zXYHxYleKV5-k,16702
+evaporation/cli.py,sha256=06TIjd6Jr_p6YjM0bOGgKqSufj5exvHXElSEAvleaNA,28392
+evaporation/evaporation.py,sha256=87kNBAplijIEk_kzPWHBOYtWDWqNAK7_oZL_U2gaV9g,16702
 haggregate/__init__.py,sha256=KfFmAI6bvEsnaflhq9pK1nzOdoyySFiXnw9o1-Nmcus,70
 haggregate/cli.py,sha256=Ou2zQRnj9ZsNM6it7HFGLavrdGaExZDartlPGPuaNLc,3363
-haggregate/haggregate.py,sha256=pXzT2z_LshxFD9USiV1je-swAj8n-iY7fetxVO8XJ-A,5200
-haggregate/regularize.cp311-win32.pyd,sha256=UOvmnXHCYPEdgA7-RDho6RKdQO8eyX2U0CKHou2-pTo,91136
+haggregate/haggregate.py,sha256=TSPm-pVW9LYs1AJU84MZMOix2DND3pgp7y4ZbvjEwuo,5206
+haggregate/regularize.cp311-win32.pyd,sha256=z0b19029Egf95qvs-KeR8cLUBgCV7H9JG7V6lvSUtuI,91136
 haggregate/regularize.pyx,sha256=aaxx-3wJtuo51G9n7GIzFb2qt6m7rXuoAES9zoI7Zcw,5800
 hspatial/__init__.py,sha256=dlTLFy7IqQwun4nz01qtYMQbU9kBmHEKoOXGIgCRf9c,123
-hspatial/cli.py,sha256=alkp-IxwMBErwL2sjZmSLWeRG3DXr0c4A4GV0O0Fk0o,10686
+hspatial/cli.py,sha256=1iAY9-ATkO_xzlGCC_WSw42S9w2ca0uRLSxWG3WIat8,10638
 hspatial/hspatial.py,sha256=fv9xia23D9W5kXG00XlDrXYMF8KotUlIfL9ZjuGEyPg,16348
 hspatial/test.py,sha256=_YZzfgEtlCJmOGOdnxwpsPC48EBZ_QaKKBdyJRmg014,1050
 htimeseries/__init__.py,sha256=by-XbIt4Q-lHHKlHEcgXLi7AjEGNv0VGNmM0ZMl8L7M,75
 htimeseries/htimeseries.py,sha256=y8rIFabSCdBwmS3vWGEuyRMtQvIZy81jqg304-kIg3w,19771
 htimeseries/timezone_utils.py,sha256=jTWhKljHXQuD_drNgfI2ytD6atf6dwnsL4qCVK8wpgA,1282
 pthelma/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pthelma/_version.py,sha256=mLrG-mC5i2vs5IEM3ZgT5S9ZdaqM1wQHESPk1-Rj79o,427
+pthelma/_version.py,sha256=RNKDW89EC1jx19YzwFi-xpYjE252Ld4fuY3bcovr8-s,427
 rocc/__init__.py,sha256=KfFB3rfJXgYL4HnVa7MNYcotG3am-CajVvh65gm9v_s,281
-rocc/calculation.cp311-win32.pyd,sha256=93zpwffJHAjUZ0MlIVmWuagmRTfK3eXhfT90CWvLunA,86016
+rocc/calculation.cp311-win32.pyd,sha256=dSvztUsNQgaklZ68AUfK06A80xNwXHGT6ELjTXLjGtI,86016
 rocc/calculation.pyx,sha256=tWWSB1u2JTCnYv6mb_YwK97vPrL7JT_ymx_5TlmG_9Y,5938
-pthelma-1.1.0.dist-info/LICENSE.rst,sha256=v1ndaPoHsiO-q3mq-ibN0HooeO-LCZBvKPfwlJRIMWs,1379
-pthelma-1.1.0.dist-info/METADATA,sha256=JEQWBdyBL7HdQQV2Psn7F78mZJi2SWnuaxEkgTSRb8o,2018
-pthelma-1.1.0.dist-info/WHEEL,sha256=CUEEiZcEHBQHmNAhE1m6c3jIKGBZTzLJKgzKvvbu8OI,97
-pthelma-1.1.0.dist-info/entry_points.txt,sha256=Kh2gKKRhObmmOASJWIwX9dDEZQ5htc3ftBlqeoGer-s,155
-pthelma-1.1.0.dist-info/top_level.txt,sha256=kWL0AYuVd_5KzKWRBkAG576ag46gKbojnWdeH_c-bzo,92
-pthelma-1.1.0.dist-info/RECORD,,
+pthelma-2.1.0.dist-info/LICENSE.rst,sha256=v1ndaPoHsiO-q3mq-ibN0HooeO-LCZBvKPfwlJRIMWs,1379
+pthelma-2.1.0.dist-info/METADATA,sha256=7iwlTCCxJeUkJ00e8o1RoaJIs9uiX-Asu1wlw8xHD7I,2018
+pthelma-2.1.0.dist-info/WHEEL,sha256=bhXcIFNv4T-G4Sw4ACrAXSbqmVpqO5W3nspTDhg-PJ4,97
+pthelma-2.1.0.dist-info/entry_points.txt,sha256=Kh2gKKRhObmmOASJWIwX9dDEZQ5htc3ftBlqeoGer-s,155
+pthelma-2.1.0.dist-info/top_level.txt,sha256=kWL0AYuVd_5KzKWRBkAG576ag46gKbojnWdeH_c-bzo,92
+pthelma-2.1.0.dist-info/RECORD,,

{pthelma-1.1.0.dist-info → pthelma-2.1.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: false
 Tag: cp311-cp311-win32