Update hooks and add ruff hook and switch to isort

Author: ViViDboarder

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -9,18 +9,26 @@ repos:
       - id: check-merge-conflict
       - id: name-tests-test
         exclude: tests/(common.py|util.py|(helpers|integration/factories)/(.+).py)
-  - repo: https://github.com/asottile/reorder_python_imports
-    rev: v3.13.0
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.11.12
     hooks:
-    - id: reorder-python-imports
-      args:
-        - --py3-plus
+      # Run the linter.
+      - id: ruff-check
+        args: [ --fix ]
+      # Run the formatter.
+      - id: ruff-format
   - repo: https://github.com/psf/black
-    rev: 24.4.2
+    rev: 25.1.0
     hooks:
       - id: black
+  - repo: https://github.com/pycqa/isort
+    rev: 6.0.1
+    hooks:
+      - id: isort
+        args: ["--profile", "black", "--force-single-line-imports", "--filter-files"]
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.10.1
+    rev: v1.16.0
     hooks:
       - id: mypy
         additional_dependencies:

acceptance/client_test.py

@@ -2,7 +2,6 @@
 
 from py_nextbus import NextBusClient
 
-
 TEST_AGENCY = "sfmta-cis"
 TEST_ROUTE = "F"
 TEST_STOP = "4513"

gen_mock.py

@@ -3,7 +3,6 @@
 from tests.mock_responses import TEST_ROUTE_ID
 from tests.mock_responses import TEST_STOP_ID
 
-
 client = NextBusClient()
 agencies = client.agencies()
 print("Agencies:")

py_nextbus/client.py

@@ -2,12 +2,10 @@
 
 import json
 import logging
-import re
 from datetime import datetime
-from time import time
 from typing import Any
-from typing import cast
 from typing import NamedTuple
+from typing import cast
 
 import requests
 from requests.exceptions import HTTPError

tests/client_test.py

@@ -12,7 +12,6 @@
 
 
 class TestNextBusClient(unittest.TestCase):
-
     def setUp(self):
         self.client = NextBusClient()