daplapath 2.0.10__tar.gz → 2.0.12__tar.gz

{daplapath-2.0.10 → daplapath-2.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: daplapath
-Version: 2.0.10
+Version: 2.0.12
 Summary: A pathlib.Path class for dapla
 License: MIT
 Author: ort

{daplapath-2.0.10 → daplapath-2.0.12}/daplapath/path.py

@@ -416,7 +416,9 @@ class Path(str, _PathBase):
         if timeout:
             timestamp: datetime.datetime = highest_numbered.timestamp
 
-            time_should_be_at_least = pd.Timestamp.now() - pd.Timedelta(minutes=timeout)
+            time_should_be_at_least = pd.Timestamp.now(tz="Europe/Oslo").replace(
+                tzinfo=None
+            ).round("s") - pd.Timedelta(minutes=timeout)
             if timestamp > time_should_be_at_least:
                 raise ValueError(
                     f"Latest version of the file was updated {timestamp[0]}, which "
@@ -506,6 +508,8 @@ class Path(str, _PathBase):
         """
         if not isinstance(period, (str, int)):
             raise TypeError(f"'period' should be string or int. Got {type(period)}")
+        if not self.period:
+            raise ValueError(f"Cannot set period to path without period. {self}")
         if str(period) == self.period:
             return self
         return self.with_periods(period)
@@ -529,6 +533,8 @@ class Path(str, _PathBase):
             raise TypeError(
                 f"'to_period' should be string or int. Got {type(to_period)}"
             )
+        if not self.periods:
+            raise ValueError(f"Cannot set period to path without period. {self}")
 
         periods: tuple[str] = (
             (str(from_period), str(to_period)) if to_period else (str(from_period),)
@@ -719,14 +725,14 @@ class Path(str, _PathBase):
 
     @property
     def partition_root(self) -> "Path":
-        if ".parquet" not in self:
+        if not self.suffix or self.count(self.suffix) != 2:
             return self
-        return self._new(self.split(".parquet")[0] + ".parquet")
+        return self._new(self.split(self.suffix)[0] + self.suffix)
 
     def is_partitioned(self) -> bool:
-        if ".parquet" not in self or self.isfile() and self.count(".parquet") != 2:
+        if not self.suffix or self.count(self.suffix) != 2:
             return False
-        return bool(len(self.glob("**/*.parquet")))
+        return bool(len(self.glob(f"**/*{self.suffix}")))
 
     def isfile(self) -> bool:
         return not self.isdir()
@@ -999,32 +1005,44 @@ class PathSeries(pd.Series, _PathBase):
 
     def within_minutes(self, minutes: int):
         """Select files with a timestamp within the given number of minutes."""
-        time_then = pd.Timestamp.now() - pd.Timedelta(minutes=minutes)
+        time_then = pd.Timestamp.now(tz="Europe/Oslo").replace(tzinfo=None).round(
+            "s"
+        ) - pd.Timedelta(minutes=minutes)
         return self.files[lambda x: x.timestamp > time_then]
 
     def within_hours(self, hours: int):
         """Select files with a timestamp within the given number of hours."""
-        time_then = pd.Timestamp.now() - pd.Timedelta(hours=hours)
+        time_then = pd.Timestamp.now(tz="Europe/Oslo").replace(tzinfo=None).round(
+            "s"
+        ) - pd.Timedelta(hours=hours)
         return self.files[lambda x: x.timestamp > time_then]
 
     def within_days(self, days: int):
         """Select files with a timestamp within the given number of days."""
-        time_then = pd.Timestamp.now() - pd.Timedelta(days=days)
+        time_then = pd.Timestamp.now(tz="Europe/Oslo").replace(tzinfo=None).round(
+            "s"
+        ) - pd.Timedelta(days=days)
         return self.files[lambda x: x.timestamp > time_then]
 
     def not_within_minutes(self, minutes: int):
         """Select files with a timestamp within the given number of minutes."""
-        time_then = pd.Timestamp.now() - pd.Timedelta(minutes=minutes)
+        time_then = pd.Timestamp.now(tz="Europe/Oslo").replace(tzinfo=None).round(
+            "s"
+        ) - pd.Timedelta(minutes=minutes)
         return self.files[lambda x: x.timestamp < time_then]
 
     def not_within_hours(self, hours: int):
         """Select files with a timestamp within the given number of hours."""
-        time_then = pd.Timestamp.now() - pd.Timedelta(hours=hours)
+        time_then = pd.Timestamp.now(tz="Europe/Oslo").replace(tzinfo=None).round(
+            "s"
+        ) - pd.Timedelta(hours=hours)
         return self.files[lambda x: x.timestamp < time_then]
 
     def not_within_days(self, days: int):
         """Select files with a timestamp within the given number of days."""
-        time_then = pd.Timestamp.now() - pd.Timedelta(days=days)
+        time_then = pd.Timestamp.now(tz="Europe/Oslo").replace(tzinfo=None).round(
+            "s"
+        ) - pd.Timedelta(days=days)
         return self.files[lambda x: x.timestamp < time_then]
 
     @property

{daplapath-2.0.10 → daplapath-2.0.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "daplapath"
-version = "2.0.10"
+version = "2.0.12"
 description = "A pathlib.Path class for dapla"
 authors = ["ort <ort@ssb.no>"]
 license = "MIT"