asyncz 0.6.0__tar.gz → 0.8.0__tar.gz

{asyncz-0.6.0 → asyncz-0.8.0}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.3
 Name: asyncz
-Version: 0.6.0
+Version: 0.8.0
 Summary: The scheduler that nobody wants but every application needs.
-Project-URL: Homepage, https://github.com/tarsil/asyncz
-Project-URL: Documentation, https://asyncz.tarsild.io/
-Project-URL: Changelog, https://asyncz.tarsild.io/release-notes/
+Project-URL: Homepage, https://github.com/dymmond/asyncz
+Project-URL: Documentation, https://asyncz.dymmond.com/
+Project-URL: Changelog, https://asyncz.dymmond.com/release-notes/
 Project-URL: Funding, https://github.com/sponsors/tarsil
-Project-URL: Source, https://github.com/tarsil/asyncz
+Project-URL: Source, https://github.com/dymmond/asyncz
 Author-email: Tiago Silva <tiago.arasilva@gmail.com>
 License-Expression: MIT
 License-File: LICENSE
@@ -37,43 +37,20 @@ Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
 Requires-Python: >=3.8
-Requires-Dist: asyncio<4.0.0,>=3.4.3
+Requires-Dist: backports-zoneinfo; python_version < '3.9'
 Requires-Dist: loguru<0.8.0,>=0.7.0
 Requires-Dist: pydantic<3.0.0,>=2.5.3
-Requires-Dist: pytz>=2022.6
-Requires-Dist: tzlocal<5.0,>=4.2
-Provides-Extra: all
-Requires-Dist: asyncio<4.0.0,>=3.4.3; extra == 'all'
-Requires-Dist: pytz>=2022.6; extra == 'all'
-Requires-Dist: tzlocal<5.0,>=4.2; extra == 'all'
-Provides-Extra: dev
-Requires-Dist: autoflake<3.0.0,>=1.4.0; extra == 'dev'
-Requires-Dist: black==24.4.2; extra == 'dev'
-Requires-Dist: flake8<8.0.0,>=3.8.3; extra == 'dev'
-Requires-Dist: ipdb>=0.13.13; extra == 'dev'
-Requires-Dist: isort<6.0.0,>=5.0.6; extra == 'dev'
-Requires-Dist: mypy<2.0.0,>=0.982; extra == 'dev'
-Requires-Dist: pdbpp; extra == 'dev'
-Requires-Dist: pre-commit<3.0.0,>=2.17.0; extra == 'dev'
-Requires-Dist: watchfiles<0.22.0,>=0.16.1; extra == 'dev'
-Provides-Extra: doc
-Requires-Dist: mdx-include<2.0.0,>=1.4.2; extra == 'doc'
-Requires-Dist: mkautodoc<0.3.0,>=0.2.0; extra == 'doc'
-Requires-Dist: mkdocs-markdownextradata-plugin<0.3.0,>=0.2.5; extra == 'doc'
-Requires-Dist: mkdocs-material<10.0.0,>=9.0.13; extra == 'doc'
-Requires-Dist: mkdocs<2.0.0,>=1.1.2; extra == 'doc'
-Requires-Dist: mkdocstrings<0.30.0,>=0.20.0; extra == 'doc'
-Requires-Dist: pyyaml<7.0.0,>=6.0; extra == 'doc'
-Provides-Extra: test
-Requires-Dist: mock>=4.0.3; extra == 'test'
-Requires-Dist: pymongo<5.0.0,>=4.3.3; extra == 'test'
-Requires-Dist: pytest-asyncio<1.0.0,>=0.19.0; extra == 'test'
-Requires-Dist: pytest-cov<6.0.0,>=2.12.0; extra == 'test'
-Requires-Dist: pytest-loguru<1,>=0.2.0; extra == 'test'
-Requires-Dist: pytest<9.0.0,>=7.1.3; extra == 'test'
-Requires-Dist: redis<6.0.0,>=4.4.0; extra == 'test'
-Requires-Dist: requests<3.0.0,>=2.27.0; extra == 'test'
-Requires-Dist: ruff<1.0.0,>=0.0.256; extra == 'test'
+Requires-Dist: tzlocal<6.0,>=4.0
+Provides-Extra: testing
+Requires-Dist: esmerald; extra == 'testing'
+Requires-Dist: mypy<2.0.0,>=0.982; extra == 'testing'
+Requires-Dist: pymongo<5.0.0,>=4.3.3; extra == 'testing'
+Requires-Dist: pytest-asyncio<1.0.0,>=0.19.0; extra == 'testing'
+Requires-Dist: pytest-cov<6.0.0,>=2.12.0; extra == 'testing'
+Requires-Dist: pytest-loguru<1,>=0.2.0; extra == 'testing'
+Requires-Dist: pytest<9.0.0,>=7.1.3; extra == 'testing'
+Requires-Dist: pytz>=2022.6; extra == 'testing'
+Requires-Dist: redis<6.0.0,>=4.4.0; extra == 'testing'
 Description-Content-Type: text/markdown
 
 # Asyncz
@@ -87,8 +64,8 @@ Description-Content-Type: text/markdown
 </p>
 
 <p align="center">
-<a href="https://github.com/tarsil/asyncz/workflows/Test%20Suite/badge.svg?event=push&branch=main" target="_blank">
-    <img src="https://github.com/tarsil/asyncz/workflows/Test%20Suite/badge.svg?event=push&branch=main" alt="Test Suite">
+<a href="https://github.com/dymmond/asyncz/workflows/Test%20Suite/badge.svg?event=push&branch=main" target="_blank">
+    <img src="https://github.com/dymmond/asyncz/workflows/Test%20Suite/badge.svg?event=push&branch=main" alt="Test Suite">
 </a>
 
 <a href="https://pypi.org/project/asyncz" target="_blank">
@@ -102,9 +79,9 @@ Description-Content-Type: text/markdown
 
 ---
 
-**Documentation**: [https://asyncz.tarsild.io](https://asyncz.tarsild.io) 📚
+**Documentation**: [https://asyncz.dymmond.com](https://asyncz.dymmond.com) 📚
 
-**Source Code**: [https://github.com/tarsil/asyncz](https://github.com/tarsil/asyncz)
+**Source Code**: [https://github.com/dymmond/asyncz](https://github.com/dymmond/asyncz)
 
 ---
 
@@ -146,16 +123,16 @@ completely indepent from any framework as well as inside ASGI frameworks such as
 
 Asyncz comes with special support to [Esmerald](https://esmerald.dymmond.com) for the simple reason that the author is
 the same but it can be added more support. If you are interested in adding support to your favourite frameworks then
-see the [contributing](https://asyncz.tarsild.io/contributing.md) section.
+see the [contributing](https://asyncz.dymmond.com/contributing.md) section.
 
 ## Concepts
 
 Like APScheduler, Asyncz also brings four kinds of components:
 
-* [Schedulers](https://asyncz.tarsild.io/schedulers.md)
-* [Triggers](https://asyncz.tarsild.io/triggers.md)
-* [Stores](https://asyncz.tarsild.io/stores.md)
-* [Executors](https://asyncz.tarsild.io/executors.md)
+* [Schedulers](https://asyncz.dymmond.com/schedulers.md)
+* [Triggers](https://asyncz.dymmond.com/triggers.md)
+* [Stores](https://asyncz.dymmond.com/stores.md)
+* [Executors](https://asyncz.dymmond.com/executors.md)
 
 ## Requirements
 
@@ -174,28 +151,28 @@ $ pip install asyncz
 
 ## The right decisions
 
-How do you know if you are choosing the right [scheduler](https://asyncz.tarsild.io/schedulers.md),
-[triggers](https://asyncz.tarsild.io/triggers.md), [stores](https://asyncz.tarsild.io/stores.md)
-and [executors](https://asyncz.tarsild.io/executors.md)?
+How do you know if you are choosing the right [scheduler](https://asyncz.dymmond.com/schedulers.md),
+[triggers](https://asyncz.dymmond.com/triggers.md), [stores](https://asyncz.dymmond.com/stores.md)
+and [executors](https://asyncz.dymmond.com/executors.md)?
 
 Well, Asyncz is intentionally designed for specific systems and already helps you out with some of
 those questions.
 
-* **Schedulers** - Natively only supports the [AsyncIOScheduler](https://asyncz.tarsild.io/schedulers.md#asyncioscheduler).
+* **Schedulers** - Natively only supports the [AsyncIOScheduler](https://asyncz.dymmond.com/schedulers.md#asyncioscheduler).
 * **Triggers** - Here it will depend of the periocidity of our tasks. Example:
-    * [CronTrigger](https://asyncz.tarsild.io/triggers.md#crontrigger) - UNIX like cron and gives you the same feeling as
+    * [CronTrigger](https://asyncz.dymmond.com/triggers.md#crontrigger) - UNIX like cron and gives you the same feeling as
 scheduling a task on a native UNIX like based system.
-    * [DateTrigger](https://asyncz.tarsild.io/triggers.md#datetrigger) - When you need to run a task once on a specific
+    * [DateTrigger](https://asyncz.dymmond.com/triggers.md#datetrigger) - When you need to run a task once on a specific
 point of time.
-    * [IntervalTrigger](https://asyncz.tarsild.io/triggers.md#intervaltrigger) - When you need to run tasks in specific
+    * [IntervalTrigger](https://asyncz.dymmond.com/triggers.md#intervaltrigger) - When you need to run tasks in specific
 intervals of time.
-    * [OrTrigger](https://asyncz.tarsild.io/triggers.md#ortrigger)/[AndTrigger](https://asyncz.tarsild.io/triggers.md#andtrigger) - If you would
+    * [OrTrigger](https://asyncz.dymmond.com/triggers.md#ortrigger)/[AndTrigger](https://asyncz.dymmond.com/triggers.md#andtrigger) - If you would
 like to combine more than one trigger (cron, interval and date) together.
-* **Stores** - Natively only supports [redis](https://asyncz.tarsild.io/stores.md#redisstore),
-[mongo](https://asyncz.tarsild.io/stores.md#mongodbstore) and [memory](https://asyncz.tarsild.io/stores.md#memorystore).
-* **Executors** - Natively only supports [AsyncIOExecutor](https://asyncz.tarsild.io/executors.md#asyncioexecutor),
-[ThreadPoolExecutor](https://asyncz.tarsild.io/executors.md#threadpoolexecutor) and
-[ProcessPoolExecutor](https://asyncz.tarsild.io/executors.md#processpoolexecutor).
+* **Stores** - Natively only supports [redis](https://asyncz.dymmond.com/stores.md#redisstore),
+[mongo](https://asyncz.dymmond.com/stores.md#mongodbstore) and [memory](https://asyncz.dymmond.com/stores.md#memorystore).
+* **Executors** - Natively only supports [AsyncIOExecutor](https://asyncz.dymmond.com/executors.md#asyncioexecutor),
+[ThreadPoolExecutor](https://asyncz.dymmond.com/executors.md#threadpoolexecutor) and
+[ProcessPoolExecutor](https://asyncz.dymmond.com/executors.md#processpoolexecutor).
 
 Sometimes having a lot of options makes the decision making very hard and Asyncz is intentionally
 designed and driven to simplify and for specific use cases but is not limited to those. In every
@@ -222,7 +199,7 @@ scheduler = AsyncIOScheduler()
 ```
 
 Initialize the rest of the application after the `scheduler` initialisation.
-More [details](https://asyncz.tarsild.io/schedulers.md) can be found with more thorough explanations.
+More [details](https://asyncz.dymmond.com/schedulers.md) can be found with more thorough explanations.
 
 This is in simple terms and in a nutshell how to start with Asyncz quickly. For more information,
 details and examples how to leverage Asyncz simply navigate through the documentation and have
@@ -230,11 +207,11 @@ fun 😁🎉.
 
 ## ASGI support
 
-Asyncz currently supports the [Esmerald framework](https://asyncz.tarsild.io/contrib/esmerald/index.md)
+Asyncz currently supports the [Esmerald framework](https://asyncz.dymmond.com/contrib/esmerald/index.md)
 and brings some batteries that are currently used by the framework and leveraging Asyncz.
 
 If you wish to have support to any other framework such as FastAPI, Starlite, Starlette or
-literally any other, check the [contributing](https://asyncz.tarsild.io/contributing.md) section and see how you can
+literally any other, check the [contributing](https://asyncz.dymmond.com/contributing.md) section and see how you can
 do it.
 
 ## Sponsors

{asyncz-0.6.0 → asyncz-0.8.0}/README.md

@@ -9,8 +9,8 @@
 </p>
 
 <p align="center">
-<a href="https://github.com/tarsil/asyncz/workflows/Test%20Suite/badge.svg?event=push&branch=main" target="_blank">
-    <img src="https://github.com/tarsil/asyncz/workflows/Test%20Suite/badge.svg?event=push&branch=main" alt="Test Suite">
+<a href="https://github.com/dymmond/asyncz/workflows/Test%20Suite/badge.svg?event=push&branch=main" target="_blank">
+    <img src="https://github.com/dymmond/asyncz/workflows/Test%20Suite/badge.svg?event=push&branch=main" alt="Test Suite">
 </a>
 
 <a href="https://pypi.org/project/asyncz" target="_blank">
@@ -24,9 +24,9 @@
 
 ---
 
-**Documentation**: [https://asyncz.tarsild.io](https://asyncz.tarsild.io) 📚
+**Documentation**: [https://asyncz.dymmond.com](https://asyncz.dymmond.com) 📚
 
-**Source Code**: [https://github.com/tarsil/asyncz](https://github.com/tarsil/asyncz)
+**Source Code**: [https://github.com/dymmond/asyncz](https://github.com/dymmond/asyncz)
 
 ---
 
@@ -68,16 +68,16 @@ completely indepent from any framework as well as inside ASGI frameworks such as
 
 Asyncz comes with special support to [Esmerald](https://esmerald.dymmond.com) for the simple reason that the author is
 the same but it can be added more support. If you are interested in adding support to your favourite frameworks then
-see the [contributing](https://asyncz.tarsild.io/contributing.md) section.
+see the [contributing](https://asyncz.dymmond.com/contributing.md) section.
 
 ## Concepts
 
 Like APScheduler, Asyncz also brings four kinds of components:
 
-* [Schedulers](https://asyncz.tarsild.io/schedulers.md)
-* [Triggers](https://asyncz.tarsild.io/triggers.md)
-* [Stores](https://asyncz.tarsild.io/stores.md)
-* [Executors](https://asyncz.tarsild.io/executors.md)
+* [Schedulers](https://asyncz.dymmond.com/schedulers.md)
+* [Triggers](https://asyncz.dymmond.com/triggers.md)
+* [Stores](https://asyncz.dymmond.com/stores.md)
+* [Executors](https://asyncz.dymmond.com/executors.md)
 
 ## Requirements
 
@@ -96,28 +96,28 @@ $ pip install asyncz
 
 ## The right decisions
 
-How do you know if you are choosing the right [scheduler](https://asyncz.tarsild.io/schedulers.md),
-[triggers](https://asyncz.tarsild.io/triggers.md), [stores](https://asyncz.tarsild.io/stores.md)
-and [executors](https://asyncz.tarsild.io/executors.md)?
+How do you know if you are choosing the right [scheduler](https://asyncz.dymmond.com/schedulers.md),
+[triggers](https://asyncz.dymmond.com/triggers.md), [stores](https://asyncz.dymmond.com/stores.md)
+and [executors](https://asyncz.dymmond.com/executors.md)?
 
 Well, Asyncz is intentionally designed for specific systems and already helps you out with some of
 those questions.
 
-* **Schedulers** - Natively only supports the [AsyncIOScheduler](https://asyncz.tarsild.io/schedulers.md#asyncioscheduler).
+* **Schedulers** - Natively only supports the [AsyncIOScheduler](https://asyncz.dymmond.com/schedulers.md#asyncioscheduler).
 * **Triggers** - Here it will depend of the periocidity of our tasks. Example:
-    * [CronTrigger](https://asyncz.tarsild.io/triggers.md#crontrigger) - UNIX like cron and gives you the same feeling as
+    * [CronTrigger](https://asyncz.dymmond.com/triggers.md#crontrigger) - UNIX like cron and gives you the same feeling as
 scheduling a task on a native UNIX like based system.
-    * [DateTrigger](https://asyncz.tarsild.io/triggers.md#datetrigger) - When you need to run a task once on a specific
+    * [DateTrigger](https://asyncz.dymmond.com/triggers.md#datetrigger) - When you need to run a task once on a specific
 point of time.
-    * [IntervalTrigger](https://asyncz.tarsild.io/triggers.md#intervaltrigger) - When you need to run tasks in specific
+    * [IntervalTrigger](https://asyncz.dymmond.com/triggers.md#intervaltrigger) - When you need to run tasks in specific
 intervals of time.
-    * [OrTrigger](https://asyncz.tarsild.io/triggers.md#ortrigger)/[AndTrigger](https://asyncz.tarsild.io/triggers.md#andtrigger) - If you would
+    * [OrTrigger](https://asyncz.dymmond.com/triggers.md#ortrigger)/[AndTrigger](https://asyncz.dymmond.com/triggers.md#andtrigger) - If you would
 like to combine more than one trigger (cron, interval and date) together.
-* **Stores** - Natively only supports [redis](https://asyncz.tarsild.io/stores.md#redisstore),
-[mongo](https://asyncz.tarsild.io/stores.md#mongodbstore) and [memory](https://asyncz.tarsild.io/stores.md#memorystore).
-* **Executors** - Natively only supports [AsyncIOExecutor](https://asyncz.tarsild.io/executors.md#asyncioexecutor),
-[ThreadPoolExecutor](https://asyncz.tarsild.io/executors.md#threadpoolexecutor) and
-[ProcessPoolExecutor](https://asyncz.tarsild.io/executors.md#processpoolexecutor).
+* **Stores** - Natively only supports [redis](https://asyncz.dymmond.com/stores.md#redisstore),
+[mongo](https://asyncz.dymmond.com/stores.md#mongodbstore) and [memory](https://asyncz.dymmond.com/stores.md#memorystore).
+* **Executors** - Natively only supports [AsyncIOExecutor](https://asyncz.dymmond.com/executors.md#asyncioexecutor),
+[ThreadPoolExecutor](https://asyncz.dymmond.com/executors.md#threadpoolexecutor) and
+[ProcessPoolExecutor](https://asyncz.dymmond.com/executors.md#processpoolexecutor).
 
 Sometimes having a lot of options makes the decision making very hard and Asyncz is intentionally
 designed and driven to simplify and for specific use cases but is not limited to those. In every
@@ -144,7 +144,7 @@ scheduler = AsyncIOScheduler()
 ```
 
 Initialize the rest of the application after the `scheduler` initialisation.
-More [details](https://asyncz.tarsild.io/schedulers.md) can be found with more thorough explanations.
+More [details](https://asyncz.dymmond.com/schedulers.md) can be found with more thorough explanations.
 
 This is in simple terms and in a nutshell how to start with Asyncz quickly. For more information,
 details and examples how to leverage Asyncz simply navigate through the documentation and have
@@ -152,11 +152,11 @@ fun 😁🎉.
 
 ## ASGI support
 
-Asyncz currently supports the [Esmerald framework](https://asyncz.tarsild.io/contrib/esmerald/index.md)
+Asyncz currently supports the [Esmerald framework](https://asyncz.dymmond.com/contrib/esmerald/index.md)
 and brings some batteries that are currently used by the framework and leveraging Asyncz.
 
 If you wish to have support to any other framework such as FastAPI, Starlite, Starlette or
-literally any other, check the [contributing](https://asyncz.tarsild.io/contributing.md) section and see how you can
+literally any other, check the [contributing](https://asyncz.dymmond.com/contributing.md) section and see how you can
 do it.
 
 ## Sponsors

asyncz-0.8.0/asyncz/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.8.0"

{asyncz-0.6.0 → asyncz-0.8.0}/asyncz/_mapping.py

@@ -27,6 +27,6 @@ class AsynczObjectMapping(BaseModel):
     def stores(self) -> Dict[str, str]:
         return {
             "memory": "asyncz.stores.memory:MemoryTaskStore",
-            "mongo": "asyncz.stores.mongo:MongoDBStore",
+            "mongodb": "asyncz.stores.mongo:MongoDBStore",
             "redis": "asyncz.stores.redis:RedisStore",
         }

{asyncz-0.6.0 → asyncz-0.8.0}/asyncz/contrib/esmerald/scheduler.py

@@ -18,7 +18,6 @@ except ImportError:
 
 if TYPE_CHECKING:
     from esmerald.applications import Esmerald
-    from pydantic.typing import AnyCallable
 
 
 class EsmeraldScheduler:
@@ -93,14 +92,15 @@ class EsmeraldScheduler:
         """
         Registers the scheduler events in the Esmerald application.
         """
+        if app.on_startup is not None:
+            app.on_startup.append(self.handler.start)
+        else:
+            app.on_startup = [self.handler.start]
 
-        @app.on_event("startup")
-        def start_scheduler() -> None:
-            self.handler.start()
-
-        @app.on_event("shutdown")
-        def stop_scheduler() -> None:
-            self.handler.shutdown()
+        if app.on_shutdown is not None:
+            app.on_shutdown.append(self.handler.shutdown)
+        else:
+            app.on_shutdown = [self.handler.shutdown]
 
     def get_scheduler(
         self,
@@ -208,7 +208,7 @@ class Task:
         except Exception as e:
             raise ImproperlyConfigured(str(e)) from e
 
-    def __call__(self, fn: "AnyCallable") -> None:
+    def __call__(self, fn: Any) -> None:
         """
         Tricking the object into think it's being instantiated by in reality
         is just returning itself.

{asyncz-0.6.0 → asyncz-0.8.0}/asyncz/executors/base.py

@@ -3,12 +3,12 @@ import traceback
 from abc import ABC, abstractmethod
 from collections import defaultdict
 from datetime import datetime, timedelta
+from datetime import timezone as tz
 from traceback import format_tb
 from typing import TYPE_CHECKING, Any, List, Optional, Union
 
 from loguru import logger
 from loguru._logger import Logger
-from pytz import utc
 
 from asyncz.events import TaskExecutionEvent
 from asyncz.events.constants import TASK_ERROR, TASK_EXECUTED, TASK_MISSED
@@ -97,7 +97,9 @@ class BaseExecutor(BaseStateExtra, ABC):
             if self.instances[task_id] == 0:
                 del self.instances[task_id]
 
-        self.logger.opt(exception=True).error(f"Error running task {task_id}", exc_info=True)
+        self.logger.opt(exception=True).error(
+            f"Error running task {task_id}", exc_info=True
+        )
 
 
 def run_task(
@@ -118,7 +120,7 @@ def run_task(
     events = []
     for run_time in run_times:
         if getattr(task, "mistrigger_grace_time", None) is not None:
-            difference = datetime.now(utc) - run_time
+            difference = datetime.now(tz.utc) - run_time
             grace_time = timedelta(seconds=task.mistrigger_grace_time)
             if difference > grace_time:
                 events.append(
@@ -182,7 +184,7 @@ async def run_coroutine_task(
     events = []
     for run_time in run_times:
         if getattr(task, "mistrigger_grace_time", None) is not None:
-            difference = datetime.now(utc) - run_time
+            difference = datetime.now(tz.utc) - run_time
             grace_time = timedelta(seconds=task.mistrigger_grace_time)
             if difference > grace_time:
                 events.append(

{asyncz-0.6.0 → asyncz-0.8.0}/asyncz/schedulers/asyncio.py

@@ -18,11 +18,16 @@ class AsyncIOScheduler(BaseScheduler):
         event_loop: AsyncOP event loop to use. Default to the global event loop.
     """
 
+    event_loop: Optional[Any] = None
+    timeout: Optional[int] = None
+    timezone: Optional[str] = None
+
     def __init__(
         self, event_loop: Optional[Any] = None, timeout: Optional[int] = None, **kwargs: Any
     ) -> None:
         super().__init__(**kwargs)
-        self.event_loop = event_loop
+        if self.event_loop is None:
+            self.event_loop = event_loop
         self.timeout = timeout
 
     def start(self, paused: bool = False):
@@ -36,7 +41,7 @@ class AsyncIOScheduler(BaseScheduler):
         self.stop_timer()
 
     def _setup(self, config: Any) -> None:
-        self.event_loop = maybe_ref(config.pop("event_loop", None))
+        self.event_loop = maybe_ref(config.pop("event_loop", asyncio.get_event_loop()))
         super()._setup(config)
 
     def start_timer(self, wait_seconds: Optional[int] = None):

{asyncz-0.6.0 → asyncz-0.8.0}/asyncz/schedulers/base.py

@@ -1,5 +1,6 @@
 import sys
 from abc import ABC, abstractmethod
+from collections.abc import MutableMapping
 from datetime import datetime, timedelta
 from importlib import import_module
 from threading import RLock
@@ -9,6 +10,7 @@ from loguru import logger
 from tzlocal import get_localzone
 
 from asyncz._mapping import AsynczObjectMapping
+from asyncz.enums import PluginInstance, SchedulerState
 from asyncz.events.base import SchedulerEvent, TaskEvent, TaskSubmissionEvent
 from asyncz.events.constants import (
     ALL_EVENTS,
@@ -36,6 +38,8 @@ from asyncz.exceptions import (
 )
 from asyncz.executors.base import BaseExecutor
 from asyncz.executors.pool import ThreadPoolExecutor
+from asyncz.schedulers.datastructures import TaskDefaultStruct
+from asyncz.state import BaseStateExtra
 from asyncz.stores.base import BaseStore
 from asyncz.stores.memory import MemoryStore
 from asyncz.tasks import Task
@@ -43,15 +47,6 @@ from asyncz.triggers.base import BaseTrigger
 from asyncz.typing import undefined
 from asyncz.utils import TIMEOUT_MAX, maybe_ref, timedelta_seconds, to_bool, to_int, to_timezone
 
-try:
-    from collections.abc import MutableMapping
-except ImportError:
-    from collections.abc import MutableMapping
-
-from asyncz.enums import PluginInstance, SchedulerState
-from asyncz.schedulers.datastructures import TaskDefaultStruct
-from asyncz.state import BaseStateExtra
-
 DictAny = Dict[Any, Any]
 
 if TYPE_CHECKING:
@@ -186,7 +181,6 @@ class BaseScheduler(BaseStateExtra, ABC):
         if not paused:
             self.wakeup()
 
-    @abstractmethod
     def shutdown(self, wait: bool = True):
         """
         Shuts down the scheduler, along with its executors and task stores.
@@ -821,7 +815,7 @@ class BaseScheduler(BaseStateExtra, ABC):
             replace_existing: The flag indicating the replacement of the task.
         """
         replacements = {}
-        for key, value in self.task_defaults.dict(exclude_none=True).items():
+        for key, value in self.task_defaults.model_dump(exclude_none=True).items():
             replacements[key] = value
 
         # Calculate the next run time if there is none defined

{asyncz-0.6.0 → asyncz-0.8.0}/asyncz/stores/redis.py

@@ -1,9 +1,8 @@
 import pickle
 from datetime import datetime
+from datetime import timezone as tz
 from typing import Any, List, Optional, Union
 
-from pytz import utc
-
 from asyncz.exceptions import AsynczException, ConflictIdError, TaskLookupError
 from asyncz.stores.base import BaseStore
 from asyncz.tasks import Task
@@ -79,7 +78,9 @@ class RedisStore(BaseStore):
             try:
                 tasks.append(self.rebuild_task(state))
             except BaseException:
-                self.logger.exception(f"Unable to restore task '{task_id}'. Removing it...")
+                self.logger.exception(
+                    f"Unable to restore task '{task_id}'. Removing it..."
+                )
                 failed_task_ids.append(task_id)
 
         if failed_task_ids:
@@ -98,7 +99,7 @@ class RedisStore(BaseStore):
     def get_all_tasks(self) -> List["TaskType"]:
         states = self.redis.hgetall(self.tasks_key)
         tasks = self.rebuild_tasks(states.items())
-        paused_sort_key = datetime(9999, 12, 31, tzinfo=utc)
+        paused_sort_key = datetime(9999, 12, 31, tzinfo=tz.utc)
         return sorted(tasks, key=lambda task: task.next_run_time or paused_sort_key)
 
     def add_task(self, task: "TaskType"):
@@ -108,12 +109,15 @@ class RedisStore(BaseStore):
         with self.redis.pipeline() as pipe:
             pipe.multi()
             pipe.hset(
-                self.tasks_key, task.id, pickle.dumps(task.__getstate__(), self.pickle_protocol)
+                self.tasks_key,
+                task.id,
+                pickle.dumps(task.__getstate__(), self.pickle_protocol),
             )
 
             if task.next_run_time:
                 pipe.zadd(
-                    self.run_times_key, {task.id: datetime_to_utc_timestamp(task.next_run_time)}
+                    self.run_times_key,
+                    {task.id: datetime_to_utc_timestamp(task.next_run_time)},
                 )
             pipe.execute()
 
@@ -123,11 +127,14 @@ class RedisStore(BaseStore):
 
         with self.redis.pipeline() as pipe:
             pipe.hset(
-                self.tasks_key, task.id, pickle.dumps(task.__getstate__(), self.pickle_protocol)
+                self.tasks_key,
+                task.id,
+                pickle.dumps(task.__getstate__(), self.pickle_protocol),
             )
             if task.next_run_time:
                 pipe.zadd(
-                    self.run_times_key, {task.id: datetime_to_utc_timestamp(task.next_run_time)}
+                    self.run_times_key,
+                    {task.id: datetime_to_utc_timestamp(task.next_run_time)},
                 )
             else:
                 pipe.zrem(self.run_times_key, task.id)

{asyncz-0.6.0 → asyncz-0.8.0}/asyncz/triggers/interval.py

@@ -6,7 +6,13 @@ from tzlocal import get_localzone
 
 from asyncz.datastructures import IntervalState
 from asyncz.triggers.base import BaseTrigger
-from asyncz.utils import datetime_repr, normalize, timedelta_seconds, to_datetime, to_timezone
+from asyncz.utils import (
+    datetime_repr,
+    normalize,
+    timedelta_seconds,
+    to_datetime,
+    to_timezone,
+)
 
 
 class IntervalTrigger(BaseTrigger):
@@ -73,7 +79,9 @@ class IntervalTrigger(BaseTrigger):
             next_trigger_time = self.start_at
         else:
             time_difference_seconds = timedelta_seconds(now - self.start_at)
-            next_interval_number = int(ceil(time_difference_seconds / self.interval_size))
+            next_interval_number = int(
+                ceil(time_difference_seconds / self.interval_size)
+            )
             next_trigger_time = self.start_at + self.interval * next_interval_number
 
         if self.jitter is not None:
@@ -98,7 +106,10 @@ class IntervalTrigger(BaseTrigger):
         return f"interval[{self.interval}]"
 
     def __repr__(self) -> str:
-        options = ["interval=%r" % self.interval, "start_at=%r" % datetime_repr(self.start_at)]
+        options = [
+            "interval=%r" % self.interval,
+            "start_at=%r" % datetime_repr(self.start_at),
+        ]
         if self.end_at:
             options.append("end_at=%r" % datetime_repr(self.end_at))
         if self.jitter:

{asyncz-0.6.0 → asyncz-0.8.0}/asyncz/utils.py

@@ -3,17 +3,20 @@ import re
 from asyncio import iscoroutinefunction
 from calendar import timegm
 from datetime import date, datetime, time, timedelta, tzinfo
+from datetime import timezone as dttz
 from functools import partial
 from typing import Any, Callable, Union
 
-from pytz import FixedOffset, timezone, utc
-
 from asyncz.exceptions import AsynczException, AsynczLookupError
 
 try:
     from threading import TIMEOUT_MAX
 except ImportError:
     TIMEOUT_MAX = 4294967
+try:
+    from zoneinfo import ZoneInfo
+except ImportError:
+    from backports.zoneinfo import ZoneInfo
 
 BOOL_VALIDATION = {
     "true": ["true", "yes", "on", "y", "t", "1", True],
@@ -61,22 +64,13 @@ def to_bool(value: str) -> bool:
     return False
 
 
-def to_timezone(value: Any) -> timezone:
+def to_timezone(value: Any) -> tzinfo:
     """
     Converts a value to timezone object.
     """
     if isinstance(value, str):
-        return timezone(value)
+        return ZoneInfo(value)
     if isinstance(value, tzinfo):
-        if not hasattr(value, "localize") or not hasattr(value, "normalize"):
-            raise TypeError("Only timezones from the pytz library are supported.")
-        if value.tzname(None) == "local":
-            raise ValueError(
-                "Unable to determine the name of the local timezone -- you must explicitly "
-                "specify the name of the local timezone. Please refrain from using timezones like "
-                "BST to prevent problems with daylight saving time. Instead, use a locale based "
-                "timezone name (such as Europe/London)."
-            )
         return value
     if value is not None:
         raise TypeError("Expected tzinfo, got %s instead" % value.__class__.__name__)
@@ -109,11 +103,11 @@ def to_datetime(
         tzname = values.pop("timezone")
 
         if tzname == "Z":
-            tz = utc
+            tz = dttz.utc
         elif tzname:
             hours, minutes = (int(x) for x in tzname[1:].split(":"))
             sign = 1 if tzname[0] == "+" else -1
-            tz = FixedOffset(sign * (hours * 60 + minutes))
+            tz = dttz(sign * timedelta(hours=hours, minutes=minutes))
 
         values = {k: int(v or 0) for k, v in values.items()}
         _datetime = datetime(**values)  # type: ignore
@@ -132,7 +126,7 @@ def to_datetime(
         )
 
     if isinstance(tz, str):
-        tz = timezone(tz)
+        tz = ZoneInfo(tz)
 
     return localize(_datetime, tz)
 
@@ -150,7 +144,7 @@ def utc_timestamp_to_datetime(timestamp: Union[int, float]) -> datetime:
     Converts the given timestamp to a datetime instance.
     """
     if timestamp is not None:
-        return datetime.fromtimestamp(timestamp, utc)
+        return datetime.fromtimestamp(timestamp, dttz.utc)
 
 
 def timedelta_seconds(delta: Any) -> Any:

{asyncz-0.6.0 → asyncz-0.8.0}/pyproject.toml

@@ -39,11 +39,10 @@ classifiers = [
     "Topic :: Internet :: WWW/HTTP",
 ]
 dependencies = [
-    "asyncio>=3.4.3,<4.0.0",
     "loguru>=0.7.0,<0.8.0",
     "pydantic>=2.5.3,<3.0.0",
-    "pytz>=2022.6",
-    "tzlocal>=4.2,<5.0",
+    "tzlocal>=4.0,<6.0",
+    'backports.zoneinfo;python_version<"3.9"',
 ]
 keywords = [
     "api",
@@ -66,39 +65,48 @@ keywords = [
 ]
 
 [project.urls]
-Homepage = "https://github.com/tarsil/asyncz"
-Documentation = "https://asyncz.tarsild.io/"
-Changelog = "https://asyncz.tarsild.io/release-notes/"
+Homepage = "https://github.com/dymmond/asyncz"
+Documentation = "https://asyncz.dymmond.com/"
+Changelog = "https://asyncz.dymmond.com/release-notes/"
 Funding = "https://github.com/sponsors/tarsil"
-Source = "https://github.com/tarsil/asyncz"
+Source = "https://github.com/dymmond/asyncz"
+
+
+[tool.hatch.envs.default]
+dependencies = ["ruff", "pre-commit>=2.17.0,<3.0.0", "twine", "ipdb", "pdbpp"]
 
 [project.optional-dependencies]
-test = [
-    # "esmerald==0.4.2",
-    "mock>=4.0.3",
+testing = [
     "pymongo>=4.3.3,<5.0.0",
     "pytest>=7.1.3,<9.0.0",
     "pytest-cov >=2.12.0,<6.0.0",
     "pytest-asyncio >=0.19.0,<1.0.0",
     "pytest-loguru>=0.2.0,<1",
     "redis>=4.4.0,<6.0.0",
-    "requests >=2.27.0,<3.0.0",
-    "ruff>=0.0.256,<1.0.0",
-]
-
-dev = [
-    "autoflake>=1.4.0,<3.0.0",
-    "black==24.4.2",
-    "flake8>=3.8.3,<8.0.0",
-    "ipdb>=0.13.13",
-    "pdbpp",
-    "isort>=5.0.6,<6.0.0",
     "mypy>=0.982,<2.0.0",
-    "pre-commit>=2.17.0,<3.0.0",
-    "watchfiles>=0.16.1,<0.22.0",
+    "esmerald",
+    "pytz>=2022.6",
 ]
 
-doc = [
+[tool.hatch.envs.default.scripts]
+clean_pyc = "find . -type f -name \"*.pyc\" -delete"
+clean_pycache = "find . -type d -name \"*__pycache__*\" -delete"
+lint = "ruff check --fix --line-length 99  asyncz tests docs_src {args}"
+build_with_check = "hatch build; twine check dist/*"
+
+[tool.hatch.envs.test]
+features = ["testing"]
+
+[tool.hatch.envs.test.scripts]
+# needs docker services running
+test = "pytest --disable-pytest-warnings {args}"
+test_man = "pytest --disable-pytest-warnings -s -vv {args}"
+coverage = "pytest --cov=asyncz --cov=tests --cov-report=term-missing:skip-covered --cov-report=html tests {args}"
+check_types = "mypy -p asyncz"
+
+
+[tool.hatch.envs.docs]
+dependencies = [
     "mkautodoc >=0.2.0,<0.3.0",
     "mkdocs >=1.1.2,<2.0.0",
     "mkdocs-material >=9.0.13,<10.0.0",
@@ -107,16 +115,13 @@ doc = [
     "mkdocstrings>=0.20.0,<0.30.0",
     "pyyaml >=6.0,<7.0.0",
 ]
-
-all = ["asyncio>=3.4.3,<4.0.0", "pytz>=2022.6", "tzlocal>=4.2,<5.0"]
+[tool.hatch.envs.docs.scripts]
+build = "mkdocs build"
+serve = "mkdocs serve --dev-addr localhost:8000"
 
 [tool.hatch.version]
 path = "asyncz/__init__.py"
 
-[tool.isort]
-profile = "black"
-known_third_party = ["asyncz", "pydantic", "starlette"]
-
 [tool.mypy]
 warn_unused_configs = true
 warn_unreachable = true
@@ -137,6 +142,9 @@ ignore = ["E501", "B008", "C901", "B026"]
 
 exclude = ["docs_src/*"]
 
+[tool.ruff.lint.isort]
+known-third-party = ["esmerald", "pydantic", "starlette"]
+
 [[tool.mypy.overrides]]
 module = "asyncz.tests.*"
 ignore_missing_imports = true

asyncz-0.6.0/asyncz/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.6.0"