Merge pull request #19 from taskiq-python/feature/releases

Package updated to be ready to be published on pypi.

Author: s3rius

.github/workflows/release.yml

@@ -0,0 +1,24 @@
+name: Release python package
+
+on:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: "3.9"
+      - name: Install deps
+        uses: knowsuchagency/poetry-install@v1
+        env:
+          POETRY_VIRTUALENVS_CREATE: false
+      - name: Release package
+        env:
+          POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }}
+        run: poetry publish --build

.github/workflows/test.yml

@@ -46,15 +46,23 @@ jobs:
       - name: Run mypy check
         run: poetry run mypy .
   pytest:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        py_version: ["3.7", "3.8", "3.9", "3.10"]
+        os: [ubuntu-latest, windows-latest]
+    runs-on: "${{ matrix.os }}"
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: "3.9"
+          python-version: "${{ matrix.py_version }}"
+      - name: Update pip
+        run: python -m pip install -U pip
+      - name: Install poetry
+        run: python -m pip install poetry
       - name: Install deps
-        uses: knowsuchagency/poetry-install@v1
+        run: poetry install
         env:
           POETRY_VIRTUALENVS_CREATE: false
       - name: Run pytest check

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "taskiq"
-version = "0.1.1"
+version = "0.0.1"
 description = "Asynchronous task queue with async support"
 authors = ["Pavel Kirilin <[email protected]>"]
 maintainers = ["Pavel Kirilin <[email protected]>"]

pyproject.toml

@@ -98,7 +98,12 @@ def __init__(
         self.executor = ThreadPoolExecutor(max_workers=sync_tasks_pool_size)
         self.cast_types = cast_types
         if logs_format is None:
-            logs_format = "%(levelname)s %(message)s"
+            logs_format = (
+                "[%(asctime)s]"
+                "[%(levelname)-7s]"
+                "[%(module)s:%(funcName)s:%(lineno)d] "
+                "%(message)s"
+            )
         self.logs_format = logs_format
 
     async def kick(self, message: BrokerMessage) -> None:

taskiq/brokers/inmemory_broker.py

@@ -20,7 +20,7 @@ class TaskiqArgs:
 
     broker: str
     tasks_pattern: str
-    modules: list[str]
+    modules: List[str]
     fs_discover: bool
     log_level: str
     workers: int

taskiq/cli/args.py

@@ -12,7 +12,7 @@
 
 from taskiq.abc.broker import AsyncBroker
 from taskiq.cli.args import TaskiqArgs
-from taskiq.cli.log_collector import LogsCollector
+from taskiq.cli.log_collector import log_collector
 from taskiq.message import TaskiqMessage
 from taskiq.result import TaskiqResult
 
@@ -131,7 +131,7 @@ async def run_task(  # noqa: WPS210
     returned = None
     # Captures function's logs.
     parse_params(signature, message)
-    with LogsCollector(logs, log_collector_format):
+    with log_collector(logs, log_collector_format):
         start_time = time()
         try:
             if asyncio.iscoroutinefunction(target):
@@ -162,7 +162,7 @@ async def run_task(  # noqa: WPS210
     )
 
 
-def exit_process(task: asyncio.Task[Any]) -> NoReturn:
+def exit_process(task: "asyncio.Task[Any]") -> NoReturn:
     """
     This function exits from the current process.
 

taskiq/cli/async_task_runner.py

@@ -1,10 +1,14 @@
 import logging
 import sys
-from contextlib import AbstractContextManager
-from typing import Any, List, TextIO
+from contextlib import contextmanager
+from typing import Generator, List, TextIO
 
 
-class LogsCollector(AbstractContextManager[TextIO]):
+@contextmanager
+def log_collector(
+    new_target: TextIO,
+    custom_format: str,
+) -> "Generator[TextIO, None, None]":
     """
     Context manager to collect logs.
 
@@ -15,27 +19,29 @@ class LogsCollector(AbstractContextManager[TextIO]):
     It can be used like this:
 
     >>> logs = io.StringIO()
-    >>> with LogsCollector(logs):
+    >>> with log_collector(logs, "%(levelname)s %(message)s"):
     >>>     print("A")
     >>>
     >>> print(f"Collected logs: {logs.get_value()}")
-    """
 
-    def __init__(self, new_target: TextIO, custom_format: str):
-        self._new_target = new_target
-        self._old_targets: List[TextIO] = []
-        self._log_handler = logging.StreamHandler(new_target)
-        self._log_handler.setFormatter(logging.Formatter(custom_format))
-
-    def __enter__(self) -> TextIO:
-        self._old_targets.append(sys.stdout)
-        self._old_targets.append(sys.stderr)
-        logging.root.addHandler(self._log_handler)
-        sys.stdout = self._new_target
-        sys.stderr = self._new_target
-        return self._new_target
-
-    def __exit__(self, *_args: Any, **_kwargs: Any) -> None:
-        sys.stderr = self._old_targets.pop()
-        sys.stdout = self._old_targets.pop()
-        logging.root.removeHandler(self._log_handler)
+    :param new_target: new target for logs. All
+        logs are written in new_target.
+    :param custom_format: custom format for
+        collected logging calls.
+    :yields: new target.
+    """
+    old_targets: "List[TextIO]" = []
+    log_handler = logging.StreamHandler(new_target)
+    log_handler.setFormatter(logging.Formatter(custom_format))
+
+    old_targets.extend([sys.stdout, sys.stderr])
+    logging.root.addHandler(log_handler)
+    sys.stdout = new_target
+    sys.stderr = new_target
+
+    try:
+        yield new_target
+    finally:
+        sys.stderr = old_targets.pop()
+        sys.stdout = old_targets.pop()
+        logging.root.removeHandler(log_handler)