Merge branch 'main' into fetch-branches

Author: StanFromIreland

.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.11", "3.12", "3.13"]
+        python-version: ["3.11", "3.12", "3.13", "3.14"]
         os: [ubuntu-latest]
 
     steps:

bpo_redirecter.py

@@ -14,8 +14,8 @@
 from functools import cache
 from pathlib import Path
 
-import hishel  # pip install hishel
 import httpx  # pip install httpx
+from hishel.httpx import SyncCacheClient  # pip install hishel
 from termcolor import colored, cprint  # pip install termcolor
 
 try:
@@ -67,7 +67,7 @@ def do_file(filename: str, dry_run: bool = False) -> None:
 
 
 def do_lines(old_lines: list[str], filename: str) -> list[str]:
-    with hishel.CacheClient() as client:
+    with SyncCacheClient() as client:
         changes = 0
         new_lines = []
         for line in old_lines:

requirements.txt

@@ -1,7 +1,7 @@
 feedparser
 ghapi
 GitPython
-hishel
+hishel>=1
 httpx
 jsonlines
 prettytable

tox.ini

@@ -3,7 +3,7 @@ requires =
     tox>=4.2
 env_list =
     lint
-    py{py3, 313, 312, 311, 310, 39}
+    py{py3, 314, 313, 312, 311}
 
 [testenv]
 skip_install = true