From 87091fb060ec263c1e9cfa71c086c995c85e65cc Mon Sep 17 00:00:00 2001 From: Robert Honz Date: Fri, 12 Jan 2024 11:12:47 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=9B=A0=EF=B8=8F=20Isort=20isn't=20used=20?= =?UTF-8?q?anymore=20due=20to=20conflicts=20with=20black.=20Black=20reform?= =?UTF-8?q?atting=20done.=20Pre-Commit-Hook=20version=20upgrades.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .pre-commit-config.yaml | 26 ++++++++++++++++---------- pyproject.toml | 3 +++ tidal_dl_ng/cli.py | 3 +-- tidal_dl_ng/config.py | 3 +-- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3b97471..36d1a49 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,7 +5,7 @@ default_stages: [commit, push] repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: "v4.4.0" + rev: "v4.5.0" hooks: - id: check-case-conflict - id: check-merge-conflict @@ -15,17 +15,17 @@ repos: - id: trailing-whitespace - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: "v0.0.230" + rev: "v0.1.12" hooks: - id: ruff - repo: https://github.com/pre-commit/mirrors-prettier - rev: "v3.0.3" + rev: "v3.1.0" hooks: - id: prettier - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v2.5.0 + rev: v4.5.0 hooks: - id: check-yaml - id: end-of-file-fixer @@ -40,13 +40,19 @@ repos: # types: [python] # language: system - - repo: local + - repo: https://github.com/asottile/seed-isort-config + rev: v2.2.0 hooks: - - id: isort - name: isort - entry: poetry run isort --settings-path pyproject.toml - types: [python] - language: system + - id: seed-isort-config + + # Disabled du to conflicts with black and I like the style of black more. + # - repo: local + # hooks: + # - id: isort + # name: isort + # entry: poetry run isort --settings-path pyproject.toml + # types: [python] + # language: system - repo: local hooks: diff --git a/pyproject.toml b/pyproject.toml index e478e49..1145492 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -165,6 +165,9 @@ profile = "black" multi_line_output = 3 indent = 4 color_output = true +known_third_party = ["Crypto", "PySide6", "coloredlogs", "constants", "dataclasses_json", "ffmpeg", "m3u8", "mutagen", "pathvalidate", "requests", "rich", "tidalapi", "typer"] + + [tool.mypy] # https://mypy.readthedocs.io/en/latest/config_file.html#using-a-pyproject-toml-file diff --git a/tidal_dl_ng/cli.py b/tidal_dl_ng/cli.py index d046597..20caafa 100644 --- a/tidal_dl_ng/cli.py +++ b/tidal_dl_ng/cli.py @@ -1,7 +1,6 @@ #!/usr/bin/env python -from typing import Annotated, Optional - from pathlib import Path +from typing import Annotated, Optional import typer from rich.live import Live diff --git a/tidal_dl_ng/config.py b/tidal_dl_ng/config.py index 81c07df..aeb5492 100644 --- a/tidal_dl_ng/config.py +++ b/tidal_dl_ng/config.py @@ -1,7 +1,6 @@ -from typing import Any - from collections.abc import Callable from json import JSONDecodeError +from typing import Any import tidalapi from requests import HTTPError