EAScheduler 0.2.3__tar.gz → 0.2.5__tar.gz

{eascheduler-0.2.3/src/EAScheduler.egg-info → eascheduler-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: EAScheduler
-Version: 0.2.3
+Version: 0.2.5
 Summary: Easy async scheduling with a nice interface
 Home-page: https://github.com/spacemanspiff2007/eascheduler
 Author: spaceman_spiff
@@ -19,9 +19,9 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: whenever==0.7.3
+Requires-Dist: whenever==0.8.0
 Requires-Dist: astral==3.2
-Requires-Dist: holidays==0.69
+Requires-Dist: holidays==0.72
 Requires-Dist: typing_extensions
 Dynamic: author
 Dynamic: classifier
@@ -137,6 +137,14 @@ scheduler.at(
 ````
 
 ## Changelog
+#### 0.2.5 (2025-05-06)
+- Updated to whenever 0.8 which introduces breaking changes
+- Updated dependencies
+
+#### 0.2.4 (2025-05-06)
+- Updated to whenever 0.8 which introduces breaking changes
+- Updated dependencies
+
 #### 0.2.3 (2025-03-26)
 - Updated dependencies
 

{eascheduler-0.2.3 → eascheduler-0.2.5}/requirements_setup.txt

@@ -1,6 +1,6 @@
 # Requirements to install and use this library
-whenever == 0.7.3
+whenever == 0.8.0
 astral   == 3.2
-holidays == 0.69
+holidays == 0.72
 
 typing_extensions

{eascheduler-0.2.3 → eascheduler-0.2.5/src/EAScheduler.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: EAScheduler
-Version: 0.2.3
+Version: 0.2.5
 Summary: Easy async scheduling with a nice interface
 Home-page: https://github.com/spacemanspiff2007/eascheduler
 Author: spaceman_spiff
@@ -19,9 +19,9 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: whenever==0.7.3
+Requires-Dist: whenever==0.8.0
 Requires-Dist: astral==3.2
-Requires-Dist: holidays==0.69
+Requires-Dist: holidays==0.72
 Requires-Dist: typing_extensions
 Dynamic: author
 Dynamic: classifier
@@ -137,6 +137,14 @@ scheduler.at(
 ````
 
 ## Changelog
+#### 0.2.5 (2025-05-06)
+- Updated to whenever 0.8 which introduces breaking changes
+- Updated dependencies
+
+#### 0.2.4 (2025-05-06)
+- Updated to whenever 0.8 which introduces breaking changes
+- Updated dependencies
+
 #### 0.2.3 (2025-03-26)
 - Updated dependencies
 

eascheduler-0.2.5/src/EAScheduler.egg-info/requires.txt

@@ -0,0 +1,4 @@
+whenever==0.8.0
+astral==3.2
+holidays==0.72
+typing_extensions

eascheduler-0.2.5/src/eascheduler/__version__.py

@@ -0,0 +1 @@
+__version__ = '0.2.5'

{eascheduler-0.2.3 → eascheduler-0.2.5}/src/eascheduler/builder/filters.py

@@ -58,8 +58,15 @@ class FilterBuilder:
     @staticmethod
     def time(lower: HINT_TIME | None = None, upper: HINT_TIME | None = None) -> FilterObject:
         """Restrict the trigger instant to a time range"""
+
+        if lower is None and upper is None:
+            msg = 'At least one of lower or upper must be provided'
+            raise ValueError(msg)
+
+        time_lower = get_time(lower) if lower is not None else None
+        time_upper = get_time(upper) if upper is not None else None
         return FilterObject(
-            TimeProducerFilter(get_time(lower), get_time(upper))
+            TimeProducerFilter(time_lower, time_upper)
         )
 
     @staticmethod

{eascheduler-0.2.3 → eascheduler-0.2.5}/src/eascheduler/builder/helper.py

@@ -16,7 +16,7 @@ from eascheduler.helpers import HINT_CLOCK_BACKWARD, HINT_CLOCK_FORWARD, TimeRep
 HINT_TIME: TypeAlias = dt_time | Time | str
 HINT_TIMEDELTA: TypeAlias = dt_timedelta | TimeDelta | int | float | str
 HINT_POS_TIMEDELTA: TypeAlias = HINT_TIMEDELTA
-HINT_INSTANT: TypeAlias = dt_datetime | None | str | HINT_TIME | HINT_TIMEDELTA | SystemDateTime
+HINT_INSTANT: TypeAlias = dt_datetime | None | str | HINT_TIME | HINT_TIMEDELTA | SystemDateTime | Instant
 HINT_NAME_OR_NR: TypeAlias = int | str | Iterable[int | str]
 HINT_DATE: TypeAlias = dt_date | dt_datetime | str | None | Date | SystemDateTime | Instant
 
@@ -98,11 +98,13 @@ def get_instant(value: HINT_INSTANT) -> Instant:
                                   value.second, nanosecond=value.microsecond * 1_000).instant()
         case SystemDateTime():
             return value.instant()
+        case Instant():
+            return value
 
     # ------------------------------------------------------------------------------------------------------------------
     # timedelta
     try:
-        timedelta = get_timedelta(value)
+        timedelta = get_timedelta(value)    # type: ignore[arg-type]
     except (ValueError, TypeError):
         pass
     else:
@@ -111,7 +113,7 @@ def get_instant(value: HINT_INSTANT) -> Instant:
     # ------------------------------------------------------------------------------------------------------------------
     # time
     try:
-        time = get_time(value)
+        time = get_time(value)              # type: ignore[arg-type]
     except (ValueError, TypeError):
         pass
     else:

{eascheduler-0.2.3 → eascheduler-0.2.5}/src/eascheduler/helpers/time_replace.py

@@ -4,7 +4,7 @@ from enum import Enum
 from typing import TYPE_CHECKING, Final, Literal, TypeAlias
 
 from typing_extensions import Self
-from whenever import Date, LocalDateTime, RepeatedTime, SkippedTime, SystemDateTime, Time
+from whenever import Date, PlainDateTime, RepeatedTime, SkippedTime, SystemDateTime, Time
 
 from eascheduler.helpers.helpers import to_enum
 
@@ -35,7 +35,7 @@ HINT_REPEATED: TypeAlias = RepeatedTimeBehavior | Literal['skip', 'earlier', 'la
 
 def find_time_after_dst_switch(dt: SystemDateTime | Date, time: Time) -> SystemDateTime:
     # DST changes typically occur on the full minute
-    t = LocalDateTime(dt.year, dt.month, dt.day, time.hour, time.minute)
+    t = PlainDateTime(dt.year, dt.month, dt.day, time.hour, time.minute)
 
     # dst is typically 1 hour, but who knows
     for _ in range(121):

{eascheduler-0.2.3 → eascheduler-0.2.5}/src/eascheduler/jobs/base.py

@@ -116,7 +116,10 @@ class JobBase(Generic[IdType]):
         self.update_next()
         return self.status
 
-    def __lt__(self, other_job: object) -> bool:
+    def __lt__(self, other_job: JobBase) -> bool:
+        if not isinstance(other_job, JobBase):
+            return NotImplemented
+
         if (other := other_job.next_run) is None:
             return True
         if (this := self.next_run) is None:

{eascheduler-0.2.3 → eascheduler-0.2.5}/src/eascheduler/producers/prod_operation.py

@@ -4,7 +4,7 @@ from random import uniform
 from typing import TYPE_CHECKING, Final
 
 from typing_extensions import Self, override
-from whenever import LocalDateTime, SkippedTime, SystemDateTime, Time, TimeDelta
+from whenever import PlainDateTime, SkippedTime, SystemDateTime, Time, TimeDelta
 
 from eascheduler.helpers import TimeReplacer, TimeSkippedError, TimeTwiceError
 from eascheduler.producers.base import DateTimeProducerBase, DateTimeProducerOperationBase
@@ -16,13 +16,13 @@ if TYPE_CHECKING:
 
 def find_time_after_dst_switch(dt: SystemDateTime, time: Time) -> Instant:
     # DST changes typically occur on the full minute
-    local = LocalDateTime(dt.year, dt.month, dt.day, time.hour, time.minute)
+    local = PlainDateTime(dt.year, dt.month, dt.day, time.hour, time.minute)
 
     while True:
         local = local.add(minutes=1, ignore_dst=True)
 
         try:
-            return dt.replace_time(local.time(), disambiguate='raise').instant()
+            return dt.replace_time(local.time(), disambiguate='raise').to_instant()
         except SkippedTime:
             continue
 
@@ -59,13 +59,13 @@ class EarliestProducerOperation(DateTimeProducerOperationBase):
     @override
     def apply_operation(self, next_dt: Instant, dt: Instant) -> Instant:
         try:
-            earliest_dt = self.earliest.replace(next_dt.to_system_tz()).instant()
+            earliest_dt = self.earliest.replace(next_dt.to_system_tz()).to_instant()
         except TimeSkippedError:
             return next_dt
         except TimeTwiceError as e:
-            earliest_dt = e.earlier.instant()
+            earliest_dt = e.earlier.to_instant()
             if earliest_dt <= dt:
-                earliest_dt = e.later.instant()
+                earliest_dt = e.later.to_instant()
 
         if next_dt < earliest_dt:
             return earliest_dt
@@ -87,13 +87,13 @@ class LatestProducerOperation(DateTimeProducerOperationBase):
     @override
     def apply_operation(self, next_dt: Instant, dt: Instant) -> Instant:
         try:
-            latest_dt = self.latest.replace(next_dt.to_system_tz()).instant()
+            latest_dt = self.latest.replace(next_dt.to_system_tz()).to_instant()
         except TimeSkippedError:
             return next_dt
         except TimeTwiceError as e:
-            latest_dt = e.earlier.instant()
+            latest_dt = e.earlier.to_instant()
             if latest_dt <= dt:
-                latest_dt = e.later.instant()
+                latest_dt = e.later.to_instant()
 
         if next_dt > latest_dt:
             return latest_dt

{eascheduler-0.2.3 → eascheduler-0.2.5}/src/eascheduler/producers/prod_sun.py

@@ -55,7 +55,7 @@ def set_location(latitude: float | str, longitude: float | str, elevation: float
     OBSERVER = Observer(latitude, longitude, elevation)
 
 
-SUN_CACHE: Final = OrderedDict()
+SUN_CACHE: Final[OrderedDict[tuple[Hashable, ...], Instant]] = OrderedDict()
 
 
 class SunProducer(DateTimeProducerBase):

{eascheduler-0.2.3 → eascheduler-0.2.5}/src/eascheduler/producers/prod_time.py

@@ -9,7 +9,7 @@ from eascheduler.producers.base import DateTimeProducerBase, not_infinite_loop
 
 
 if TYPE_CHECKING:
-    from whenever import Instant
+    from whenever import Instant, SystemDateTime
 
 
 class TimeProducer(DateTimeProducerBase):
@@ -27,6 +27,8 @@ class TimeProducer(DateTimeProducerBase):
     @override
     def get_next(self, dt: Instant) -> Instant:     # type: ignore[return]
 
+        local_dts: tuple[SystemDateTime, ...]
+
         date = dt.to_system_tz().date()
         for _ in not_infinite_loop():  # noqa: RET503
             try:
@@ -37,7 +39,7 @@ class TimeProducer(DateTimeProducerBase):
                 local_dts = (e.earlier, e.later)
 
             for local_dt in local_dts:
-                next_dt = local_dt.instant()
+                next_dt = local_dt.to_instant()
                 if next_dt > dt and ((f := self._filter) is None or f.allow(local_dt)):
                     return next_dt
 

eascheduler-0.2.3/src/EAScheduler.egg-info/requires.txt

@@ -1,4 +0,0 @@
-whenever==0.7.3
-astral==3.2
-holidays==0.69
-typing_extensions

eascheduler-0.2.3/src/eascheduler/__version__.py

@@ -1 +0,0 @@
-__version__ = '0.2.3'