opendate 0.1.4__py3-none-any.whl → 0.1.6__py3-none-any.whl

date/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.1.4'
+__version__ = '0.1.6'
 
 import datetime as _datetime
 

date/date.py

@@ -1040,7 +1040,7 @@ class Time(_pendulum.Time):
         | np.datetime64
         | Self
         | None,
-        tz: str | _zoneinfo.ZoneInfo | _datetime.tzinfo | None = UTC,
+        tz: str | _zoneinfo.ZoneInfo | _datetime.tzinfo | None = None,
         raise_err: bool = False,
     ) -> Self | None:
         """From datetime-like object
@@ -1061,11 +1061,12 @@ class Time(_pendulum.Time):
                 raise ValueError('Empty value')
             return
 
-        if obj.__class__ == cls:
+        if obj.__class__ == cls and not tz:
             return obj
 
-        return cls(obj.hour, obj.minute, obj.second, obj.microsecond,
-                   tzinfo=obj.tzinfo or tz)
+        tz = tz or obj.tzinfo or UTC
+
+        return cls(obj.hour, obj.minute, obj.second, obj.microsecond, tzinfo=tz)
 
 
 class DateTime(DateBusinessMixin, _pendulum.DateTime):
@@ -1219,7 +1220,7 @@ class DateTime(DateBusinessMixin, _pendulum.DateTime):
         | np.datetime64
         | Self
         | None,
-        tz: str | _zoneinfo.ZoneInfo | _datetime.tzinfo | None = UTC,
+        tz: str | _zoneinfo.ZoneInfo | _datetime.tzinfo | None = None,
         raise_err: bool = False,
     ) -> Self | None:
         """From datetime-like object
@@ -1263,28 +1264,30 @@ class DateTime(DateBusinessMixin, _pendulum.DateTime):
                 raise ValueError('Empty value')
             return
 
-        if obj.__class__ == cls:
+        if obj.__class__ == cls and not tz:
             return obj
 
         if isinstance(obj, pd.Timestamp):
             obj = obj.to_pydatetime()
-            return cls.instance(obj, tz=tz)
+            return cls.instance(obj, tz=tz or UTC)
         if isinstance(obj, np.datetime64):
             obj = np.datetime64(obj, 'us').astype(_datetime.datetime)
-            return cls.instance(obj, tz=tz)
+            return cls.instance(obj, tz=tz or UTC)
+
+        if obj.__class__ == Date:
+            return cls(obj.year, obj.month, obj.day, tzinfo=tz or UTC)
+        if isinstance(obj, _datetime.date) and not isinstance(obj, _datetime.datetime):
+            return cls(obj.year, obj.month, obj.day, tzinfo=tz or UTC)
+
+        tz = tz or obj.tzinfo or UTC
 
         if obj.__class__ == Time:
             return cls.combine(Date.today(), obj, tzinfo=tz)
         if isinstance(obj, _datetime.time):
             return cls.combine(Date.today(), obj, tzinfo=tz)
 
-        if obj.__class__ == Date:
-            return cls(obj.year, obj.month, obj.day, tzinfo=tz)
-        if isinstance(obj, _datetime.date) and not isinstance(obj, _datetime.datetime):
-            return cls(obj.year, obj.month, obj.day, tzinfo=tz)
-
         return cls(obj.year, obj.month, obj.day, obj.hour, obj.minute,
-                   obj.second, obj.microsecond, obj.tzinfo or tz)
+                   obj.second, obj.microsecond, tzinfo=tz)
 
 
 class IntervalError(AttributeError):
@@ -1438,18 +1441,35 @@ class Interval:
                 yield thedate
             thedate = thedate.add(days=1)
 
+    def start_of_series(self, unit='month') -> list[Date]:
+        """Return a series between and inclusive of begdate and enddate.
+
+        >>> Interval(Date(2018, 1, 5), Date(2018, 4, 5)).start_of_series('month')
+        [Date(2018, 1, 1), Date(2018, 2, 1), Date(2018, 3, 1), Date(2018, 4, 1)]
+        >>> Interval(Date(2018, 4, 30), Date(2018, 7, 30)).start_of_series('month')
+        [Date(2018, 4, 1), Date(2018, 5, 1), Date(2018, 6, 1), Date(2018, 7, 1)]
+        >>> Interval(Date(2018, 1, 5), Date(2018, 4, 5)).start_of_series('week')
+        [Date(2018, 1, 1), Date(2018, 1, 8), ..., Date(2018, 4, 2)]
+        """
+        begdate = self.begdate.start_of(unit)
+        enddate = self.enddate.start_of(unit)
+        interval = _pendulum.interval(begdate, enddate)
+        return [Date.instance(d).start_of(unit) for d in interval.range(f'{unit}s')]
+
     def end_of_series(self, unit='month') -> list[Date]:
         """Return a series between and inclusive of begdate and enddate.
 
         >>> Interval(Date(2018, 1, 5), Date(2018, 4, 5)).end_of_series('month')
         [Date(2018, 1, 31), Date(2018, 2, 28), Date(2018, 3, 31), Date(2018, 4, 30)]
+        >>> Interval(Date(2018, 4, 30), Date(2018, 7, 30)).end_of_series('month')
+        [Date(2018, 4, 30), Date(2018, 5, 31), Date(2018, 6, 30), Date(2018, 7, 31)]
         >>> Interval(Date(2018, 1, 5), Date(2018, 4, 5)).end_of_series('week')
         [Date(2018, 1, 7), Date(2018, 1, 14), ..., Date(2018, 4, 8)]
         """
         begdate = self.begdate.end_of(unit)
         enddate = self.enddate.end_of(unit)
         interval = _pendulum.interval(begdate, enddate)
-        return [Date.instance(d) for d in interval.range(f'{unit}s')]
+        return [Date.instance(d).end_of(unit) for d in interval.range(f'{unit}s')]
 
     def days(self) -> int:
         """Return days between (begdate, enddate] or negative (enddate, begdate].

{opendate-0.1.4.dist-info → opendate-0.1.6.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: opendate
-Version: 0.1.4
-Summary: 
+Version: 0.1.6
+Summary: Python business datetimes
 Home-page: https://github.com/bissli/opendate
 License: MIT
 Author: bissli

opendate-0.1.6.dist-info/RECORD

@@ -0,0 +1,7 @@
+date/__init__.py,sha256=vPv4a112UZpPY0IShVpSq4ffImTTinxuySxWt1vyeS0,2747
+date/date.py,sha256=S10D2_VtXraKzpdS0xtbzLEF_n8ny0Xadmtnc4AKSCk,55943
+date/extras.py,sha256=7xsOsdhKrmGoyLl5W4Xhg9TfuytaaIH7uKWW9PvR5sE,2832
+opendate-0.1.6.dist-info/LICENSE,sha256=V4Rx8WWy7v8Fim6PHcEBszpZkDLbCHeorz1e_gr0Cbk,1111
+opendate-0.1.6.dist-info/METADATA,sha256=mbJikEalgLHajmzvTEF_MRiLUPGX0u94I5DdFnva6JQ,1841
+opendate-0.1.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+opendate-0.1.6.dist-info/RECORD,,

opendate-0.1.4.dist-info/RECORD

@@ -1,7 +0,0 @@
-date/__init__.py,sha256=eB3ZluWh9M_QVfMOpmjeigLItgUl7mywdby88ffQfbE,2747
-date/date.py,sha256=Z-8-5T8TfLtgiGe0ahK7QIgXjbBEDmrGRw8zEhiQD2Y,54819
-date/extras.py,sha256=7xsOsdhKrmGoyLl5W4Xhg9TfuytaaIH7uKWW9PvR5sE,2832
-opendate-0.1.4.dist-info/LICENSE,sha256=V4Rx8WWy7v8Fim6PHcEBszpZkDLbCHeorz1e_gr0Cbk,1111
-opendate-0.1.4.dist-info/METADATA,sha256=up550EjO3j1IFI7F_iUrlugXe6rkcfpQpeRCQrEqgN8,1816
-opendate-0.1.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-opendate-0.1.4.dist-info/RECORD,,