diff --git a/.dockerignore b/.dockerignore index e685645..bbc9af0 100644 --- a/.dockerignore +++ b/.dockerignore @@ -13,4 +13,4 @@ **/*Dockerfile* LICENSE README.md -.ruff.toml +pyproject.toml diff --git a/app_bot/requirements.txt b/app_bot/requirements.txt index c5316c1..28a79d7 100644 --- a/app_bot/requirements.txt +++ b/app_bot/requirements.txt @@ -1,5 +1,4 @@ PyYAML==6.0.1 -addict==2.4.0 pyrofork==2.3.21.post3 tenacity==8.2.3 tgcrypto-pyrofork==1.2.6 diff --git a/app_worker/worker/core/tasks/encode.py b/app_worker/worker/core/tasks/encode.py index 11109f0..3802cbb 100644 --- a/app_worker/worker/core/tasks/encode.py +++ b/app_worker/worker/core/tasks/encode.py @@ -53,7 +53,7 @@ class EncodeToH264Task(AbstractFfBinaryTask): proc = await self._run_proc(cmd) if not proc: - return None + return stdout, stderr = await self._get_stdout_stderr(proc) self._log.info( diff --git a/.ruff.toml b/pyproject.toml similarity index 51% rename from .ruff.toml rename to pyproject.toml index ddbe1d2..f5a5858 100644 --- a/.ruff.toml +++ b/pyproject.toml @@ -1,11 +1,15 @@ +[tool.ruff] line-length = 88 +indent-width = 4 +target-version = "py312" src = ["app_api", "app_bot", "app_worker"] +required-version = ">=0.3.4" -[lint] -select = ["F", "E", "W", "I001"] +[tool.ruff.lint] +select = ["F", "E", "W", "I001", "RET", "SLF001"] ignore = ["E501"] # Skip line length violations -[format] +[tool.ruff.format] indent-style = "space" quote-style = "single" line-ending = "lf" diff --git a/yt_shared/setup.py b/yt_shared/setup.py index 8f8cdc1..8903488 100644 --- a/yt_shared/setup.py +++ b/yt_shared/setup.py @@ -24,6 +24,7 @@ setup( 'Intended Audience :: Developers', 'Natural Language :: English', 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', ], description='Common shared utils for yt downloader bot', install_requires=get_requirements(), diff --git a/yt_shared/yt_shared/clients/github.py b/yt_shared/yt_shared/clients/github.py index 9ac6cfe..123be2a 100644 --- a/yt_shared/yt_shared/clients/github.py +++ b/yt_shared/yt_shared/clients/github.py @@ -5,7 +5,7 @@ import aiohttp from yt_shared.schemas.ytdlp import LatestVersion -class YtDlpGithubClient: +class YtdlpGithubClient: """yt-dlp Github version number checker.""" LATEST_TAG_URL = 'https://github.com/yt-dlp/yt-dlp/releases/latest' diff --git a/yt_shared/yt_shared/ytdlp/version_checker.py b/yt_shared/yt_shared/ytdlp/version_checker.py index c566b92..5bd2f40 100644 --- a/yt_shared/yt_shared/ytdlp/version_checker.py +++ b/yt_shared/yt_shared/ytdlp/version_checker.py @@ -2,7 +2,7 @@ import asyncio import logging from sqlalchemy.ext.asyncio import AsyncSession -from yt_shared.clients.github import YtDlpGithubClient +from yt_shared.clients.github import YtdlpGithubClient from yt_shared.repositories.ytdlp import YtdlpRepository from yt_shared.schemas.ytdlp import CurrentVersion, LatestVersion, VersionContext @@ -15,7 +15,7 @@ class YtdlpVersionChecker: def __init__(self) -> None: self._log = logging.getLogger(self.__class__.__name__) self._ytdlp_repository = YtdlpRepository() - self._ytdlp_client = YtDlpGithubClient() + self._ytdlp_client = YtdlpGithubClient() async def get_version_context(self, db: AsyncSession) -> VersionContext: latest, current = await asyncio.gather(