Replace isort with ruff (#137)

xchwarze · Nov 25, 2024 · 389ebda · 389ebda
1 parent add730b
commit 389ebda
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 26 deletions.
diff --git a/.flake8 b/.flake8
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -16,10 +16,6 @@ repos:
     rev: v3.1.0
     hooks:
       - id: prettier
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.13.2
-    hooks:
-      - id: isort
   - repo: https://github.com/adrienverge/yamllint.git
     rev: v1.35.1
     hooks:

diff --git a/example/encrypted_authenticator.py b/example/encrypted_authenticator.py
@@ -4,7 +4,9 @@
 
 import aiohttp
 
-from samsungtvws.encrypted.authenticator import SamsungTVEncryptedWSAsyncAuthenticator
+from samsungtvws.encrypted.authenticator import (
+    SamsungTVEncryptedWSAsyncAuthenticator,
+)
 
 logging.basicConfig(level=logging.DEBUG)
 

diff --git a/example/encrypted_remote.py b/example/encrypted_remote.py
@@ -3,7 +3,10 @@
 
 import aiohttp
 
-from samsungtvws.encrypted.remote import SamsungTVEncryptedWSAsyncRemote, SendRemoteKey
+from samsungtvws.encrypted.remote import (
+    SamsungTVEncryptedWSAsyncRemote,
+    SendRemoteKey,
+)
 
 logging.basicConfig(level=logging.DEBUG)
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,16 +1,3 @@
-[tool.isort]
-# https://github.com/PyCQA/isort/wiki/isort-Settings
-profile = "black"
-force_sort_within_sections = true
-known_first_party = [
-    "samsungtvws",
-    "tests",
-]
-forced_separate = [
-    "tests",
-]
-combine_as_imports = true
-
 [tool.ruff]
 line-length = 79
 target-version = "py38"
@@ -27,10 +14,22 @@ select = [
     "C",
     "E",
     "F",
+    "I", # isort
     "UP", # pyupgrade
     "W",
 ]
 
+[tool.ruff.lint.isort]
+force-sort-within-sections = true
+known-first-party = [
+    "samsungtvws",
+    "tests",
+]
+forced-separate = [
+    "tests",
+]
+combine-as-imports = true
+
 [tool.ruff.lint.mccabe]
 max-complexity = 18
 

diff --git a/samsungtvws/async_connection.py b/samsungtvws/async_connection.py
@@ -12,7 +12,16 @@
 import logging
 import ssl
 from types import TracebackType
-from typing import Any, Awaitable, Callable, Dict, List, Optional, Sequence, Union
+from typing import (
+    Any,
+    Awaitable,
+    Callable,
+    Dict,
+    List,
+    Optional,
+    Sequence,
+    Union,
+)
 
 from websockets.client import WebSocketClientProtocol, connect
 from websockets.exceptions import ConnectionClosed

diff --git a/tests/test_encrypted_authenticator.py b/tests/test_encrypted_authenticator.py
@@ -5,7 +5,9 @@
 import pytest
 from yarl import URL
 
-from samsungtvws.encrypted.authenticator import SamsungTVEncryptedWSAsyncAuthenticator
+from samsungtvws.encrypted.authenticator import (
+    SamsungTVEncryptedWSAsyncAuthenticator,
+)
 
 
 @pytest.mark.asyncio