clockwork 0.7.1__tar.gz → 0.8.0__tar.gz

{clockwork-0.7.1 → clockwork-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: clockwork
-Version: 0.7.1
+Version: 0.8.0
 Summary: Toolkit for time-related operations including scheduling, logging, date manipulation, and more.
 Project-URL: repository, https://github.com/zteinck/clockwork
 Project-URL: homepage, https://github.com/zteinck/clockwork
@@ -15,6 +15,7 @@ Requires-Dist: pandas>=3.0.6
 Requires-Dist: polars>=2.0.0
 Requires-Dist: python-dateutil>=2.9.0.post0
 Requires-Dist: schedule>=1.2.2
+Requires-Dist: tzlocal>=5.4.4
 Description-Content-Type: text/markdown
 
 # clockwork

{clockwork-0.7.1 → clockwork-0.8.0}/pyproject.toml

@@ -1,27 +1,28 @@
-[project]
-name = "clockwork"
-version = "0.7.1"
-description = "Toolkit for time-related operations including scheduling, logging, date manipulation, and more."
-authors = [
-    { name = "Zachary Einck", email = "zacharyeinck@gmail.com" }
-]
-license = { text = "MIT" }
-readme = "README.md"
-requires-python = ">=3.13"
-dependencies = [
-    "holidays>=0.106",
-    "numpy>=2.5.4",
-    "oddments>=0.10.1",
-    "pandas>=3.0.6",
-    "polars>=2.0.0",
-    "python-dateutil>=2.9.0.post0",
-    "schedule>=1.2.2",
-]
-
-[project.urls]
-repository = "https://github.com/zteinck/clockwork"
-homepage = "https://github.com/zteinck/clockwork"
-
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
+[project]
+name = "clockwork"
+version = "0.8.0"
+description = "Toolkit for time-related operations including scheduling, logging, date manipulation, and more."
+authors = [
+    { name = "Zachary Einck", email = "zacharyeinck@gmail.com" }
+]
+license = { text = "MIT" }
+readme = "README.md"
+requires-python = ">=3.13"
+dependencies = [
+    "holidays>=0.106",
+    "numpy>=2.5.4",
+    "oddments>=0.10.1",
+    "pandas>=3.0.6",
+    "polars>=2.0.0",
+    "python-dateutil>=2.9.0.post0",
+    "schedule>=1.2.2",
+    "tzlocal>=5.4.4",
+]
+
+[project.urls]
+repository = "https://github.com/zteinck/clockwork"
+homepage = "https://github.com/zteinck/clockwork"
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"

{clockwork-0.7.1 → clockwork-0.8.0/src}/clockwork/__init__.py

@@ -1,12 +1,13 @@
-from .timestamp import Timestamp
+from .constants import ISO_DATE_FORMAT, UTC
+from .date_time import Datetime
+from .decorators import print_duration
 from .month_end import MonthEnd
 from .quarter_end import QuarterEnd
-from .decorators import print_duration
 
 from .utils import (
     format_duration,
     temporal_format_to_regex,
     )
 
-__version__ = '0.7.1'
+__version__ = '0.8.0'
 __author__ = 'Zachary Einck <zacharyeinck@gmail.com>'

{clockwork-0.7.1/clockwork/timestamp → clockwork-0.8.0/src/clockwork}/_decorators.py

@@ -32,7 +32,7 @@ def other_to_delta(func):
             return delta
 
         # Otherwise, 'other' is assumed to be a delta and the resulting
-        # Timestamp object is returned.
+        # Datetime object is returned.
         delta = self._build_delta(other)
         dt = func(self, delta)
         ts = self._make_base(dt)
@@ -84,8 +84,8 @@ def handle_next_last(func):
 
         Returns
         ------------
-        shifted : Timestamp
-            Timestamp instance
+        shifted : Datetime
+            Datetime instance
         '''
 
         (

clockwork-0.8.0/src/clockwork/constants.py

@@ -0,0 +1,6 @@
+from zoneinfo import ZoneInfo
+
+
+ISO_DATE_FORMAT = '%Y-%m-%d'
+MONTHS_IN_YEAR = 12
+UTC = ZoneInfo('UTC')

clockwork-0.7.1/clockwork/timestamp/core.py → clockwork-0.8.0/src/clockwork/date_time.py

@@ -1,19 +1,31 @@
-import datetime
 import calendar
-from copy import deepcopy
+import datetime
+from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
 
-import holidays as hd
-import pandas as pd
+from dateutil.relativedelta import relativedelta as relative_delta
+from dateutil.parser import parse as parse_dt_string
+from holidays import UnitedStates
 import numpy as np
 from oddments import Validator, UNSET
-from dateutil.relativedelta import relativedelta
-from dateutil.parser import parse
+import pandas as pd
+from tzlocal import get_localzone_name
+
+from .constants import (
+    ISO_DATE_FORMAT,
+    MONTHS_IN_YEAR,
+    UTC,
+    )
 
-from ..constants import MONTHS_IN_YEAR
-from ._decorators import *
+from ._decorators import (
+    other_to_dt,
+    other_to_delta,
+    handle_next_last,
+    to_period_end,
+    skip_shift,
+    )
 
 
-class Timestamp:
+class Datetime:
     '''
     Description
     --------------------
@@ -22,7 +34,7 @@ class Timestamp:
 
     Class Attributes
     --------------------
-    repr_format : str
+    display_format : str
         String of datetime format codes used to render the object's string
         representation.
     business_hours : tuple[int]
@@ -47,7 +59,7 @@ class Timestamp:
     #| Class Attributes                                                        |
     #╰-------------------------------------------------------------------------╯
 
-    repr_format = '%Y-%m-%d %I:%M:%S.%f %p'
+    display_format = '%Y-%m-%d %I:%M:%S.%f %p'
     business_hours = (8, 17) # 8am - 5pm
     weekday_map = None
     holiday_calendar = None
@@ -145,10 +157,21 @@ class Timestamp:
         return self.time_zone
 
 
+    @property
+    def tz_key(self):
+        ''' time zone key '''
+        return None if self.tz is None else self.tz.key
+
+
     @property
     def ymd(self):
         ''' Date string in ISO 8601 format (i.e. YYYY-MM-DD) '''
-        return self.to_string('%Y-%m-%d')
+        return self.to_string(ISO_DATE_FORMAT)
+
+
+    @property
+    def display(self):
+        return self.to_string(self.display_format)
 
 
     @property
@@ -225,7 +248,7 @@ class Timestamp:
     @property
     def is_weekend(self):
         ''' returns True if the date falls on the weekend '''
-        return self.weekday_name in {'Saturday','Sunday'}
+        return self.weekday_index >= 5
 
 
     @property
@@ -274,9 +297,9 @@ class Timestamp:
 
 
     @property
-    def is_normalized(self):
-        ''' returns True if date has no time component (i.e. 00:00:00) '''
-        return self.time == datetime.time.min
+    def has_time_component(self):
+        ''' whether the date has a time component (i.e. not 00:00:00) '''
+        return self.time != datetime.time.min
 
 
     @property
@@ -348,6 +371,8 @@ class Timestamp:
 
 
     def __getattr__(self, name):
+        if name.startswith('_'):
+            raise AttributeError(name)
         return getattr(self.dt, name)
 
 
@@ -360,10 +385,10 @@ class Timestamp:
 
 
     def __repr__(self):
-        return '{0}(dt={1}, tz={2})'.format(
+        return '{0}({1!r}, tz_key={2!r})'.format(
             self.__class__.__name__,
-            self.to_string(self.repr_format),
-            self.time_zone,
+            self.display,
+            self.tz_key,
             )
 
 
@@ -423,11 +448,11 @@ class Timestamp:
     #| Instance Methods                                                        |
     #╰-------------------------------------------------------------------------╯
 
-    def shift(self, *, biz_days=None, **kwargs):
+    def shift(self, *, business_days=None, **kwargs):
         '''
         Description
         ------------
-        Returns a Timestamp object representing self shifted by a delta.
+        Returns a Datetime object representing self shifted by a delta.
 
         Parameters
         ------------
@@ -437,16 +462,16 @@ class Timestamp:
             available:
 
             relative : bool
-                If True, kwargs are passed to 'relative_delta' instead of
+                If True, kwargs are passed to 'relativedelta' instead of
                 'datetime.timedelta'.
-            biz_days : int
+            business_days : int
                 Similar to the datetime.timedelta days argument, except
                 weekends and holidays are excluded from the count.
 
         Returns
         ------------
-        shifted : Timestamp
-            Timestamp object representing self post-shift.
+        shifted : Datetime
+            Datetime object representing self post-shift.
         '''
 
         obj = (
@@ -455,13 +480,19 @@ class Timestamp:
             else self.clone()
             )
 
-        if biz_days is None or biz_days == 0:
+        business_days = self._ensure_int(
+            value=business_days,
+            name='business_days',
+            allow_none=True,
+            )
+
+        if business_days is None or business_days == 0:
             return obj
 
-        delta = int(np.sign(biz_days))
+        delta = int(np.sign(business_days))
         counter = 0
 
-        while counter < abs(biz_days):
+        while counter < abs(business_days):
             obj = obj._shift(days=delta)
             if obj.is_business_day:
                 counter += 1
@@ -503,13 +534,17 @@ class Timestamp:
 
 
     def to_utc(self):
-        return self.to_time_zone('utc')
+        return self.to_time_zone(UTC)
 
 
     def to_naive(self):
         return self.to_time_zone(None)
 
 
+    def localize(self):
+        return self.to_time_zone('Local')
+
+
     def clone(self):
         ''' returns a deep copy of self '''
         return self._spawn(self)
@@ -522,7 +557,7 @@ class Timestamp:
 
     def to_datetime(self):
         ''' returns a copy of the underlying datetime.datetime object '''
-        return deepcopy(self.dt)
+        return self.dt
 
 
     def to_pandas_timestamp(self):
@@ -576,10 +611,10 @@ class Timestamp:
         pass
 
 
-    def normalize(self):
+    def to_midnight(self):
         dt = self.to_datetime()
-        normalized_dt = self._normalize(dt)
-        return self._spawn(normalized_dt)
+        dt = self._to_midnight(dt)
+        return self._spawn(dt)
 
 
     def replace(self, **kwargs):
@@ -608,7 +643,7 @@ class Timestamp:
                 )
 
         delta_cls = (
-            relativedelta
+            relative_delta
             if relative
             else datetime.timedelta
             )
@@ -624,10 +659,17 @@ class Timestamp:
 
 
     def _to_time_zone(self, dt, tz):
-        tz = self._resolve_time_zone(value=tz, name='tz')
-        dt = dt.astimezone(tz)
-        if tz is None:
-            dt = dt.replace(tzinfo=None)
+        tz = self._resolve_time_zone(
+            value=tz,
+            name='tz',
+            )
+
+        dt = (
+            dt.replace(tzinfo=None)
+            if tz is None
+            else dt.astimezone(tz)
+            )
+
         return dt
 
 
@@ -654,7 +696,7 @@ class Timestamp:
             Value to convert to datetime. Supported formats include:
                 • None → returns the current datetime (i.e. now)
                 • pd.Timestamp
-                • cw.Timestamp or subclass
+                • cw.Datetime or subclass
                 • datetime.datetime
                 • datetime.date
                 • int or float (expressed in seconds)
@@ -669,9 +711,9 @@ class Timestamp:
         source_format : str | None
             Datetime format code(s) used to parse 'source' when it is a string
             (e.g. '%Y%m%d %H%M%S').
-        source_tz : UNSET | None | str | datetime.timezone
+        source_tz : UNSET | None | str | datetime.timezone | ZoneInfo
             Source time zone.
-        target_tz : UNSET | None | str | datetime.timezone
+        target_tz : UNSET | None | str | datetime.timezone | ZoneInfo
             Desired time zone.
         offset : int
             If a day of the week is provided (e.g., 'Monday'), the current week
@@ -702,7 +744,7 @@ class Timestamp:
             now = datetime.datetime.now(tz=_target_tz)
             days = weekday - now.weekday()
             dt = now + datetime.timedelta(days=days, weeks=offset)
-            dt = self._normalize(dt)
+            dt = self._to_midnight(dt)
             return dt
 
 
@@ -733,16 +775,43 @@ class Timestamp:
             return dt
 
 
-        def ensure_parsed_tz(dt):
+        def resolve_tz(dt):
+
+            def normalize_tz(dt):
+                if (
+                    dt.tzinfo is None
+                    or isinstance(dt.tzinfo, ZoneInfo)
+                    ):
+                    return dt
+
+                if dt.tzinfo == datetime.timezone.utc:
+                    return dt.replace(tzinfo=UTC)
+
+                return dt.astimezone(UTC)
+
+
+            dt = normalize_tz(dt)
+
+            (
+            Validator(
+                types=ZoneInfo,
+                allow_none=True,
+                )
+            .validate(
+                tzinfo=dt.tzinfo
+                )
+            )
+
             if source_tz is not UNSET and source_tz != dt.tzinfo:
-                if dt.tzinfo is None:
-                    dt = dt.replace(tzinfo=source_tz)
-                else:
+
+                if dt.tzinfo is not None:
                     raise ValueError(
-                        f"Time zone parsed from string ({dt.tzinfo}) does "
-                        f"not align with 'source_tz' ({source_tz})."
+                        f"The resolved datetime's time zone ({dt.tzinfo!r}) "
+                        f"does not align with 'source_tz' ({source_tz!r})."
                         )
 
+                dt = dt.replace(tzinfo=source_tz)
+
             if target_tz is not UNSET and target_tz != dt.tzinfo:
                 dt = self._to_time_zone(dt=dt, tz=target_tz)
 
@@ -754,8 +823,14 @@ class Timestamp:
             for tz in (source_tz, target_tz)
             )
 
-
         if source is None:
+
+            if source_tz is not UNSET:
+                raise ValueError(
+                    "'source_tz' must be UNSET when 'source' is None, got: "
+                    f"{source_tz!r}"
+                    )
+
             dt = datetime.datetime.now(tz=_target_tz)
             return dt
 
@@ -763,7 +838,7 @@ class Timestamp:
 
             if source_format is not None:
                 dt = datetime.datetime.strptime(source, source_format)
-                dt = ensure_parsed_tz(dt)
+                dt = resolve_tz(dt)
                 return dt
 
             for func in (try_weekday, try_quarter_end):
@@ -771,7 +846,9 @@ class Timestamp:
                 if dt is not None:
                     return dt
 
-            dt = ensure_parsed_tz(parse(source))
+            dt = parse_dt_string(source)
+            dt = resolve_tz(dt)
+
             return dt
 
         if source_format is not None:
@@ -791,7 +868,7 @@ class Timestamp:
                 tzinfo=_source_tz,
                 )
 
-        elif isinstance(source, Timestamp):
+        elif isinstance(source, Datetime):
             dt = source.to_datetime()
 
         elif hasattr(source, 'to_pydatetime'):
@@ -804,28 +881,17 @@ class Timestamp:
                 )
             .validate(
                 type(dt),
-                f"'dt' type",
+                "'dt' type",
                 )
             )
 
-            if source_tz is not UNSET and source_tz != dt.tzinfo:
-                raise ValueError(
-                    f"The resolved datetime's Time zone ({dt.tzinfo}) does "
-                    f"not align with 'source_tz' ({source_tz})."
-                    )
-
-            if target_tz is not UNSET and target_tz != dt.tzinfo:
-                dt = self._to_time_zone(dt=dt, tz=target_tz)
-
+            dt = resolve_tz(dt)
             return dt
 
 
         # timestamp expressed in seconds
         elif isinstance(source, (float, int)):
-            if not (
-                source_tz is UNSET
-                or source_tz == datetime.timezone.utc
-                ):
+            if source_tz not in (UNSET, UTC):
                 raise ValueError(
                     "'source_tz' must be UNSET or UTC when 'source' is a "
                     f"timestamp, got: {source_tz!r}"
@@ -874,11 +940,11 @@ class Timestamp:
 
     @staticmethod
     def _make_base(*args, **kwargs):
-        return Timestamp(*args, **kwargs)
+        return Datetime(*args, **kwargs)
 
 
     @staticmethod
-    def _normalize(value):
+    def _to_midnight(value):
         ''' Sets the time component to zero (midnight) '''
         return value.replace(hour=0, minute=0, second=0, microsecond=0)
 
@@ -887,8 +953,8 @@ class Timestamp:
     def _validate_month(month):
         if not (1 <= month <= MONTHS_IN_YEAR):
             raise ValueError(
-                "'month' must be between 1 and "
-                f"{MONTHS_IN_YEAR}, got: {month}."
+                f"'month' must be between 1 and {MONTHS_IN_YEAR}, got: "
+                f"{month}."
                 )
 
 
@@ -899,29 +965,64 @@ class Timestamp:
 
 
     @staticmethod
-    def _ensure_int(value, name=None):
-        Validator(types=(int, str)).validate(value, name)
+    def _ensure_int(
+        value,
+        name=None,
+        whitelist=None,
+        allow_none=False,
+        positive_only=False,
+        ):
 
-        if isinstance(value, str):
-            if value.isdigit():
-                return int(value)
+        if allow_none and value is None:
+            return value
+
+        if isinstance(value, bool):
             raise TypeError(
-                f"Failed to convert 'value' to integer: {value!r}"
+                f'{name!r} must be an int or str, got bool: {value!r}'
                 )
 
+        if isinstance(value, str):
+            try:
+                return int(value)
+            except ValueError as exc:
+                raise ValueError(
+                    f'Integer conversion failed for {name!r}: {value!r}'
+                    ) from exc
+
+        params = {}
+
+        if positive_only:
+            params.update({
+                'min_value': 0,
+                'min_inclusive': False,
+                })
+
+        (
+        Validator(
+            types=int,
+            whitelist=whitelist,
+            **params,
+            )
+        .validate(value, name)
+        )
+
         return value
 
 
     @staticmethod
     def _resolve_time_zone(value, name):
 
-        cls = datetime.timezone
-
         (
         Validator(
-            types=(str, cls),
+            types=(
+                str,
+                ZoneInfo,
+                datetime.timezone,
+                ),
             allow_none=True,
             allow_unset=True,
+            allow_blank=False,
+            allow_whitespace=False,
             )
         .validate(value, name)
         )
@@ -930,17 +1031,30 @@ class Timestamp:
             return value
 
         if isinstance(value, str):
-            if value.lower() == 'utc':
-                return cls.utc
-            else:
+            if value.upper() == UTC.key:
+                return UTC
+            if value.lower() == 'local':
+                value = get_localzone_name()
+            try:
+                return ZoneInfo(value)
+            except ZoneInfoNotFoundError:
                 raise ValueError(
-                    f'Unsupported string value for {name!r}: {value!r}.'
-                    )
+                    'String values must be valid ZoneInfo keys. Invalid '
+                    f'value for {name!r}: {value!r}.'
+                    ) from None
 
-        if isinstance(value, cls):
+        if isinstance(value, ZoneInfo):
             return value
 
-        raise AssertionError
+        utc = datetime.timezone.utc
+
+        if value == utc:
+            return UTC
+
+        raise ValueError(
+            f'Expected {utc!r} or a valid ZoneInfo key; fixed offsets are '
+            f'not supported. Unsupported value for {name!r}: {value!r}.'
+            )
 
 
     #╭-------------------------------------------------------------------------╮
@@ -960,7 +1074,7 @@ class Timestamp:
     @classmethod
     def _get_holiday_calendar(cls):
         if cls.holiday_calendar is None:
-            cls.holiday_calendar = hd.UnitedStates()
+            cls.holiday_calendar = UnitedStates()
         return cls.holiday_calendar
 
 
@@ -982,7 +1096,7 @@ class Timestamp:
     @classmethod
     def _get_month_end_cls(cls):
         if cls._month_end_cls is None:
-            from ..month_end import MonthEnd
+            from .month_end import MonthEnd
             cls._month_end_cls = MonthEnd
         return cls._month_end_cls
 
@@ -990,6 +1104,6 @@ class Timestamp:
     @classmethod
     def _get_quarter_end_cls(cls):
         if cls._quarter_end_cls is None:
-            from ..quarter_end import QuarterEnd
+            from .quarter_end import QuarterEnd
             cls._quarter_end_cls = QuarterEnd
         return cls._quarter_end_cls

{clockwork-0.7.1 → clockwork-0.8.0/src}/clockwork/month_end.py

@@ -2,11 +2,11 @@ import datetime
 
 from oddments import Validator, UNSET
 
-from .timestamp import Timestamp
-from .constants import MONTHS_IN_YEAR
+from .constants import ISO_DATE_FORMAT, MONTHS_IN_YEAR
+from .date_time import Datetime
 
 
-class MonthEnd(Timestamp):
+class MonthEnd(Datetime):
     '''
     Description
     --------------------
@@ -26,7 +26,7 @@ class MonthEnd(Timestamp):
     #| Class Attributes                                                        |
     #╰-------------------------------------------------------------------------╯
 
-    repr_format = '%Y-%m-%d'
+    repr_format = ISO_DATE_FORMAT
     _increment = 1
 
 
@@ -44,7 +44,7 @@ class MonthEnd(Timestamp):
 
     @property
     def long_label(self):
-        return self.to_string('%Y-%m-%d')
+        return self.to_string(ISO_DATE_FORMAT)
 
 
     @property
@@ -147,11 +147,8 @@ class MonthEnd(Timestamp):
                 f'of {self.month_name} {self.year}'
                 )
 
-        if not self.is_normalized:
-            return (
-                'the time component must be normalized (i.e. all zoroes), '
-                f'got: {self.time}'
-                )
+        if self.has_time_component:
+            return f'it includes a time component: {self.time}'
 
 
     def _init_dt(
@@ -179,7 +176,7 @@ class MonthEnd(Timestamp):
             parameters are provided. Use positive values to move forward in
             time and negative values to move backward in time.
         kwargs : dict
-            Additional keyword arguments are forwarded to the Timestamp
+            Additional keyword arguments are forwarded to the Datetime
             constructor.
         '''
 
@@ -208,7 +205,11 @@ class MonthEnd(Timestamp):
 
             if has_year_or_month:
                 year, month = (
-                    self._ensure_int(value=v, name=k)
+                    self._ensure_int(
+                        value=v,
+                        name=k,
+                        positive_only=True,
+                        )
                     for k, v in {
                         'year': year,
                         'month': month,
@@ -239,5 +240,5 @@ class MonthEnd(Timestamp):
                 tzinfo=_target_tz,
                 )
 
-        self._dt = self._normalize(self._dt)
+        self._dt = self._to_midnight(self._dt)
         self._validate()

{clockwork-0.7.1 → clockwork-0.8.0/src}/clockwork/quarter_end.py

@@ -102,7 +102,7 @@ class QuarterEnd(MonthEnd):
             when no other parameters are provided. Use positive values to move
             forward in time and negative values to move backward in time.
         kwargs : dict
-            Additional keyword arguments forwarded to the Timestamp
+            Additional keyword arguments forwarded to the Datetime
             constructor.
         '''
 
@@ -132,23 +132,17 @@ class QuarterEnd(MonthEnd):
                     "simultaneously."
                     )
 
-            month = self._ensure_int(month)
-
-            # validate month
-            (
-            Validator(
-                types=int,
+            month = self._ensure_int(
+                value=month,
+                name='month',
                 whitelist=self.scheme,
                 )
-            .validate(
-                month=month
-                )
-            )
 
         if has_quarter:
             quarter = self._ensure_int(
                 value=quarter,
                 name='quarter',
+                whitelist=[1, 2, 3, 4],
                 )
             month = self.scheme[quarter - 1]
 
@@ -304,7 +298,13 @@ class QuarterEnd(MonthEnd):
         if parsed is None:
             return None
 
-        year, quarter = (cls._ensure_int(x) for x in parsed)
+        year, quarter = (
+            cls._ensure_int(
+                value=value,
+                positive_only=True,
+                )
+            for value in parsed
+            )
 
         if not (1 <= quarter <= 4):
             raise ValueError(

{clockwork-0.7.1 → clockwork-0.8.0/src}/clockwork/taskmaster/_task.py

@@ -4,7 +4,7 @@ from contextlib import redirect_stdout
 
 from schedule import CancelJob
 
-from ..timestamp import Timestamp
+from ..date_time import Datetime
 from ..utils import format_duration
 
 from .utils import (
@@ -38,7 +38,7 @@ class Task:
         name of job
     at : str
         at time string
-    expiry : Timestamp
+    expiry : Datetime
         If not None, job will be set inactive and stop running after this
         datetime
     func : func
@@ -173,12 +173,12 @@ class Task:
 
             self.update_table(active=0 if set_inactive else 1)
 
-        if self.expiry and self.expiry < Timestamp():
+        if self.expiry and self.expiry < Datetime():
             update_status('cancelled on expiration', set_inactive=True)
             if self.verbose:
                 print('Killing', end=' ')
                 print(self.name, end='')
-                print(f' @ {Timestamp()} ->', end=' ')
+                print(f' @ {Datetime()} ->', end=' ')
                 print('Job Cancelled')
 
         # cancel job if it was cancelled on cascasde or
@@ -195,16 +195,16 @@ class Task:
                 if self.verbose:
                     print('Running', end=' ')
                     print(self.name, end='')
-                    print(f' @ {Timestamp()} ->', end=' ')
+                    print(f' @ {Datetime()} ->', end=' ')
 
                 if self.restrict_to_business_hours \
-                    and not Timestamp().is_business_hours:
+                    and not Datetime().is_business_hours:
                     raise PrerequisiteError(
                         'cannot execute outside of business hours'
                         )
 
                 if self.restrict_to_business_days \
-                    and not Timestamp().is_business_day:
+                    and not Datetime().is_business_day:
                     raise PrerequisiteError(
                         'cannot execute during the weekend'
                         )

{clockwork-0.7.1 → clockwork-0.8.0/src}/clockwork/taskmaster/taskmaster.py

@@ -4,7 +4,7 @@ import uuid
 
 import oddments as odd
 
-from ..timestamp import Timestamp
+from ..date_time import Datetime
 from ._scheduler import TaskScheduler
 from ._task import Task
 
@@ -147,9 +147,9 @@ class TaskMaster:
             constituent time.
         interval : int
             schedule.Scheduler.every interval argument
-        start : Timestamp
+        start : Datetime
             If not None, job will be not be added until this datetime
-        expiry : Timestamp
+        expiry : Datetime
             If not None, job will be set inactive and stop running after this
             datetime
         kwargs : keyword arguments
@@ -168,7 +168,7 @@ class TaskMaster:
         if not hasattr(cls, 'scheduler'):
             cls.scheduler = TaskScheduler()
 
-        now = Timestamp()
+        now = Datetime()
 
         if (start and start > now) or (expiry and expiry < now):
             return

{clockwork-0.7.1 → clockwork-0.8.0}/uv.lock

@@ -12,7 +12,7 @@ resolution-markers = [
 
 [[package]]
 name = "clockwork"
-version = "0.7.1"
+version = "0.8.0"
 source = { editable = "." }
 dependencies = [
     { name = "holidays" },
@@ -22,6 +22,7 @@ dependencies = [
     { name = "polars" },
     { name = "python-dateutil" },
     { name = "schedule" },
+    { name = "tzlocal" },
 ]
 
 [package.metadata]
@@ -33,6 +34,7 @@ requires-dist = [
     { name = "polars", specifier = ">=2.0.0" },
     { name = "python-dateutil", specifier = ">=2.9.0.post0" },
     { name = "schedule", specifier = ">=1.2.2" },
+    { name = "tzlocal", specifier = ">=5.4.4" },
 ]
 
 [[package]]
@@ -286,3 +288,15 @@ sdist = { url = "https://files.pythonhosted.org/packages/d9/68/f1b440335057bfce7
 wheels = [
     { url = "https://files.pythonhosted.org/packages/94/21/1e5995a1c920cce14e4bffae20c665ec10e7ed03ab25e006cd741092b718/tzdata-2026.5-py2.py3-none-any.whl", hash = "sha256:b683bd1b6659ddcd810ff02ad09ba821d4bf1065072805063eb35c49617905ac", size = 347996, upload-time = "2026-10-03T09:23:12.535Z" },
 ]
+
+[[package]]
+name = "tzlocal"
+version = "5.4.5"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "tzdata", marker = "sys_platform == 'win32'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/d8/89/2bd035df331499589fc92e59375c17c6cea6a500453b2c5f6a6ec9572825/tzlocal-5.4.5.tar.gz", hash = "sha256:ba976898bad27945178c9ca25c222c19e322b30c10342b9f40b46714f70d2d5f", size = 31483, upload-time = "2026-10-22T09:09:26.38Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/7b/c1/9be4e1a8a30db8729a86628073910e56f85aaf8a659e053f376a2e6ea5a8/tzlocal-5.4.5-py3-none-any.whl", hash = "sha256:ecab534f6d65d9deb4c4ea52c121ab6dd5958e9b878e71dcb102578269752454", size = 18215, upload-time = "2026-10-22T09:09:24.447Z" },
+]

clockwork-0.7.1/clockwork/constants.py

@@ -1 +0,0 @@
-MONTHS_IN_YEAR = 12

clockwork-0.7.1/clockwork/timestamp/__init__.py

@@ -1 +0,0 @@
-from .core import Timestamp