Fix tests and update project

Fix tests that were broken as a result of 1a314e3 ("Simplify by simply linking
to /all/").

Upgrade project to use uv for dependencies, linting, and formatting.

Signed-off-by: Dan Rue <danrue@gmail.com>

Author: danrue

.flake8

@@ -1,2 +1,3 @@
 __pycache__
 *.swp
+.venv/

.gitignore

@@ -1,10 +1,10 @@
-all: black flake8 test
+all: format lint test
 
-black:
-	black *.py
+format:
+	uv run ruff format *.py
 
-flake8:
-	flake8
+lint:
+	uv run ruff check *.py
 
 test:
-	pytest
+	uv run pytest

Makefile

@@ -1,6 +1,6 @@
 # Lorifier
 
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black)
+[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 
 Lorifier is a mutt display filter that is used to add
 [lore](https://www.kernel.org/lore.html) links to compatible emails, when
@@ -32,8 +32,8 @@ Message-ID from the displayed email, so that it will not be displayed.
 
 ## Requirements
 
-lorifier.py requires python 3, and has been tested with 3.7.
+lorifier.py requires python 3.
 
 ## Testing
 
-Run 'make test' or 'pytest'. Requires pytest.
+Run 'make' or 'uv run pytest'.

README.md

@@ -20,13 +20,11 @@
 
 import email
 import email.policy
-import os
 import sys
-import time
 
 from email.utils import mktime_tz, parsedate_tz, formatdate
 
-LORE_MASK = 'https://lore.kernel.org/all/%s'
+LORE_MASK = "https://lore.kernel.org/all/%s"
 
 
 class muttemail:
@@ -37,7 +35,7 @@ def as_string(self):
         return self.message.as_string(policy=email.policy.EmailPolicy(utf8=True))
 
     def create_xdate_header(self):
-        """ Add an X-Date header, which is Date converted to localtime. """
+        """Add an X-Date header, which is Date converted to localtime."""
         date = self.message.get("Date", None)
         if not date:
             return
@@ -47,11 +45,11 @@ def create_xdate_header(self):
         self.message.add_header("X-Date", formatdate(epoch_time, localtime=True))
 
     def remove_header(self, header):
-        """ Remove the named header """
+        """Remove the named header"""
         for i in reversed(range(len(self.message._headers))):
             header_name = self.message._headers[i][0].lower()
             if header_name == header.lower():
-                del (self.message._headers[i])
+                del self.message._headers[i]
 
     def create_xuri_header(self):
         """

lorifier.py

@@ -0,0 +1,21 @@
+[project]
+name = "lorifier"
+version = "0.1.0"
+description = "Mutt display filter that adds lore.kernel.org links to emails"
+readme = "README.md"
+license = "BSD-2-Clause"
+requires-python = ">=3.7"
+dependencies = []
+
+[dependency-groups]
+dev = [
+    "ruff",
+    "pytest",
+    "pytest-mock",
+]
+
+[tool.ruff]
+line-length = 120
+
+[tool.ruff.lint]
+select = ["E", "F", "W"]

pyproject.toml

@@ -1,12 +1,8 @@
-import lorifier
-import os
 import subprocess
-import time
-import urllib
 
 
 def test_sample_1():
-    """ Just a typical example email """
+    """Just a typical example email"""
     out = subprocess.run(
         "cat samples/1.email | ./lorifier.py",
         shell=True,
@@ -16,14 +12,14 @@ def test_sample_1():
     assert len(out.stderr) == 0
     lines = [
         "\nX-Date: ",
-        "\nX-URI: https://lore.kernel.org/lkml/20181201095551.GN8952@piout.net\n",
+        "\nX-URI: https://lore.kernel.org/all/20181201095551.GN8952@piout.net\n",
     ]
     for line in lines:
         assert line in out.stdout.decode("utf-8")
 
 
 def test_sample_2():
-    """ A typical example, with emoji in body """
+    """A typical example, with emoji in body"""
     out = subprocess.run(
         "cat samples/2.email | ./lorifier.py",
         shell=True,
@@ -33,7 +29,7 @@ def test_sample_2():
     assert len(out.stderr) == 0
     lines = [
         "\nX-Date: ",
-        "\nX-URI: https://lore.kernel.org/lkml/20181201095551.GN8952@piout.net\n",
+        "\nX-URI: https://lore.kernel.org/all/20181201095551.GN8952@piout.net\n",
         "\nHello,\n",
         "\nHere is some emoji! 🍌🍌🚀🚀\n",
     ]
@@ -42,7 +38,7 @@ def test_sample_2():
 
 
 def test_sample_3():
-    """ UTF-8 headers """
+    """UTF-8 headers"""
     out = subprocess.run(
         "cat samples/3.email | ./lorifier.py",
         shell=True,
@@ -52,56 +48,9 @@ def test_sample_3():
     assert len(out.stderr) == 0
     lines = [
         "\nX-Date: ",
-        "\nX-URI: https://lore.kernel.org/lkml/CADYN=9LEVUgz_ou6kWrXZGBpUZ5Ti7BB+0Uxp1NtP18BJDVHCg@mail.gmail.com\n",
+        "\nX-URI: https://lore.kernel.org/all/CADYN=9LEVUgz_ou6kWrXZGBpUZ5Ti7BB+0Uxp1NtP18BJDVHCg@mail.gmail.com\n",
         "\nCc: =?UTF-8?B?RGFuaWVsIETDrWF6?= <daniel.diaz@linaro.org>,\n",
         '\n        "open list:KERNEL SELFTEST FRAMEWORK" \n',
     ]
     for line in lines:
         assert line in out.stdout.decode("utf-8")
-
-
-def test_get_lorifier_list_fresh(mocker):
-    with open("samples/lists.txt") as f:
-        lists = f.read()
-    with open(".in", "w") as f:
-        f.write(lists)
-    mocker.patch("urllib.request.urlretrieve")
-    lore_lists = lorifier.muttemail._get_lorifier_list(
-        cache_file=os.path.abspath(".in")
-    )
-    urllib.request.urlretrieve.assert_not_called()
-    assert len(lore_lists) == 29
-    for line in lists.splitlines():
-        (key, value) = line.split(": ")
-        assert lore_lists[key] == value
-    os.remove(".in")
-
-
-def test_get_lorifier_list_old(mocker):
-    with open("samples/lists.txt") as f:
-        lists = f.read()
-    with open(".in", "w") as f:
-        f.write(lists)
-    os.utime(".in", (time.time(), time.time() - 604800))
-
-    mocker.patch("urllib.request.urlretrieve")
-    lorifier.muttemail._get_lorifier_list(
-        url="https://lore.kernel.org/lists.txt",
-        cache_file=os.path.abspath(".in"),
-        cache_ttl=86400,
-    )
-    urllib.request.urlretrieve.assert_called_once_with(
-        "https://lore.kernel.org/lists.txt", os.path.abspath(".in")
-    )
-
-    os.remove(".in")
-
-
-def test_get_lorifier_list_first_run(mocker):
-    mocker.patch("urllib.request.urlretrieve")
-    lorifier.muttemail._get_lorifier_list(
-        url="https://lore.kernel.org/lists.txt", cache_file=os.path.abspath(".in")
-    )
-    urllib.request.urlretrieve.assert_called_once_with(
-        "https://lore.kernel.org/lists.txt", os.path.abspath(".in")
-    )