feat: Migrate from httpx to httpx2

Author: kevinrenskers

example/config/asgi.py

@@ -11,6 +11,6 @@
 
 from django.core.asgi import get_asgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings")
 
 application = get_asgi_application()

example/config/wsgi.py

@@ -11,6 +11,6 @@
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings")
 
 application = get_wsgi_application()

justfile

@@ -0,0 +1,8 @@
+test:
+  uv run pytest
+
+format:
+  uv run ruff format .
+
+check:
+  uv run ruff check . && uv run mypy .

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "django-rss-filter"
-version = "0.14.1"
+version = "0.15.0"
 description = "Filter public RSS feeds, remove articles that contain certain keywords or categories."
 authors = [
     {name = "Kevin Renskers", email = "kevin@loopwerk.io"},
@@ -13,7 +13,7 @@ dependencies = [
     "django>=4.2.0",
     "feedgen>=1.0.0",
     "feedparser>=6.0.11",
-    "httpx>=0.28.1",
+    "httpx2>=2.2.0",
 ]
 keywords = ["rss", "atom", "feed", "filter", "mute", "django"]
 classifiers = [

rssfilter/models.py

@@ -1,12 +1,12 @@
 import uuid
 from datetime import timedelta
 
-import httpx
+import httpx2
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.urls import reverse
 from django.utils import timezone
-from httpx import ConnectError, ConnectTimeout, ReadTimeout
+from httpx2 import ConnectError, ConnectTimeout, ReadTimeout
 
 from . import USER_AGENT
 from .settings import RSS_FILTER_CACHE_SECONDS
@@ -76,7 +76,7 @@ def get_feed_body(self) -> str:
             return self.feed_body
 
         try:
-            r = httpx.get(self.feed_url, follow_redirects=True, timeout=2, headers={"User-Agent": USER_AGENT})
+            r = httpx2.get(self.feed_url, follow_redirects=True, timeout=2, headers={"User-Agent": USER_AGENT})
             self.feed_body = r.text
             self.cache_date = timezone.now()
             self.save()

rssfilter/utils.py

@@ -2,10 +2,10 @@
 from typing import Literal
 
 import feedparser
-import httpx
+import httpx2
 from feedgen.feed import FeedGenerator
 from feedparser import FeedParserDict
-from httpx import ConnectError, ConnectTimeout
+from httpx2 import ConnectError, ConnectTimeout
 
 from . import USER_AGENT
 
@@ -28,7 +28,7 @@ def validate_feed(feed_url: str) -> FeedValidationSuccess | FeedValidationError:
         # since we can't set a timeout with feedparser. It also makes sure
         # that validating and then fetching the feed is done in a consistent
         # manner.
-        r = httpx.get(feed_url, follow_redirects=True, timeout=2, headers={"User-Agent": USER_AGENT})
+        r = httpx2.get(feed_url, follow_redirects=True, timeout=2, headers={"User-Agent": USER_AGENT})
         feed = validate_feed_body(r.text)
         if not feed:
             return FeedValidationError(False, "This doesn't seem to be a valid RSS or Atom feed")