Merge pull request #52 from pganssle/pin_lxml

Pin lxml to < 5.2.0

Author: pganssle

.github/workflows/test.yml

@@ -21,10 +21,10 @@ jobs:
       uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
-    - uses: FedericoCarboni/setup-ffmpeg@v2
+    - uses: FedericoCarboni/setup-ffmpeg@v3
       id: setup-ffmpeg
       with:
-        token: ${{ secrets.GH_API_TOKEN }}
+        token: ${{ github.token }}
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

pyproject.toml

@@ -23,7 +23,7 @@ dependencies = [
     "jinja2",
     "click>=6.0",
     "progressbar2",
-    "lxml>=2.0",
+    "lxml>=2.0,<5.2.0",
     "SQLAlchemy>=1.4,<2",
     "attrs>=22.0",
     "backports.strenum>=1.1.1;python_version<'3.11'",

scripts/bundle_fa_subset.py

@@ -69,7 +69,7 @@ def extract_font_awesome(icon: str, css: str) -> str:
     name = f".fa-{icon}"
 
     m = re.search(
-        name + ":+before {\s+content: " "['\"]+(?P<codepoint>[^'\"]+)",
+        name + r":+before {\s+content: " "['\"]+(?P<codepoint>[^'\"]+)",
         css,
         re.MULTILINE,
     )
@@ -176,9 +176,9 @@ def bad_options(message: str) -> typing.NoReturn:
 ExistingFileOrDir = click.Path(
     dir_okay=True, file_okay=True, exists=True, path_type=pathlib.Path
 )  # type: ignore
-FA_VERSION_TEMPLATE: typing.Final[
-    str
-] = "https://use.fontawesome.com/releases/v{version}/fontawesome-free-{version}-web.zip"
+FA_VERSION_TEMPLATE: typing.Final[str] = (
+    "https://use.fontawesome.com/releases/v{version}/fontawesome-free-{version}-web.zip"
+)
 LATEST_FA_VERSION: typing.Final[str] = "6.2.0"
 
 

src/audio_feeder/_compat.py

@@ -6,6 +6,6 @@
 try:
     from enum import StrEnum  # type: ignore[attr-defined]
 except ImportError:
-    from backports.strenum import StrEnum  # type: ignore[import]
+    from backports.strenum import StrEnum  # type: ignore[import,no-redef]
 
 __all__ = ("Self", "StrEnum")

src/audio_feeder/_db_types.py

@@ -2,6 +2,7 @@
 
 This exists for compatibility while the old database_handler code still exists.
 """
+
 import typing
 
 from ._object_types import ID, SchemaObject
@@ -16,17 +17,12 @@
 
 # pragma: nocover
 class DatabaseHandler(typing.Protocol):
-    def __init__(self, db_loc: PathType):
-        ...
+    def __init__(self, db_loc: PathType): ...
 
-    def save_table(self, table_name: TableName, table_contents: Table) -> None:
-        ...
+    def save_table(self, table_name: TableName, table_contents: Table) -> None: ...
 
-    def load_table(self, table_name: TableName) -> Table:
-        ...
+    def load_table(self, table_name: TableName) -> Table: ...
 
-    def save_database(self, database: Database) -> None:
-        ...
+    def save_database(self, database: Database) -> None: ...
 
-    def load_database(self) -> Database:
-        ...
+    def load_database(self) -> Database: ...

src/audio_feeder/_object_types.py

@@ -3,6 +3,7 @@
 This is partially to allow typing without circular imports and partially to
 allow typing on the generated schema types.
 """
+
 import typing
 
 from ._compat import Self
@@ -15,13 +16,11 @@
 class SchemaObject(typing.Protocol):
     id: ID
 
-    def to_dict(self) -> typing.Mapping[str, typing.Any]:
-        ...
+    def to_dict(self) -> typing.Mapping[str, typing.Any]: ...
 
     def to_dict_sparse(
         self, *, _filter: typing.Callable = ...
-    ) -> typing.Mapping[str, typing.Any]:
-        ...
+    ) -> typing.Mapping[str, typing.Any]: ...
 
     def copy(self: Self) -> Self:
         """Make a new copy of this object."""

src/audio_feeder/cache_utils.py

@@ -1,6 +1,7 @@
 """
 Functions useful for caching.
 """
+
 import functools
 import typing
 

src/audio_feeder/cli.py

@@ -1,6 +1,7 @@
 """
 Command line scripts
 """
+
 import pathlib
 
 import click

src/audio_feeder/config.py

@@ -1,6 +1,7 @@
 """
 Configuration manager - handles the application's global configuration.
 """
+
 import base64
 import functools
 import graphlib
@@ -64,13 +65,11 @@ class TemplateStr(str):
 
 
 @typing.overload
-def _path_converter(s: typing.Union[TemplatePath, TemplateStr]) -> TemplatePath:
-    ...
+def _path_converter(s: typing.Union[TemplatePath, TemplateStr]) -> TemplatePath: ...
 
 
 @typing.overload
-def _path_converter(s: typing.Union[str, Path]) -> Path:
-    ...
+def _path_converter(s: typing.Union[str, Path]) -> Path: ...
 
 
 def _path_converter(s):
@@ -288,25 +287,25 @@ def find_requirements(attr_name: str) -> typing.Sequence[str]:
     @typing.overload
     def _make_single_replacement(
         self, value: typing.Union[str, TemplateStr], replacements: _ReplacementsMapType
-    ) -> str:
-        ...
+    ) -> str: ...
 
     @typing.overload
     def _make_single_replacement(
         self,
         value: typing.Union[Path, TemplatePath],
         replacements: _ReplacementsMapType,
-    ) -> Path:
-        ...
+    ) -> Path: ...
 
     def _make_single_replacement(self, value, replacements):
         if isinstance(value, TemplatePath):
             return Path(
                 *(
                     self._make_single_replacement(
-                        TemplateStr(component)
-                        if component.startswith("{{")
-                        else component,
+                        (
+                            TemplateStr(component)
+                            if component.startswith("{{")
+                            else component
+                        ),
                         replacements=replacements,
                     )
                     for component in value.parts

src/audio_feeder/directory_parser.py

@@ -107,14 +107,14 @@ class AudiobookLoader(BaseAudioLoader):
     )
 
     COVER_PATTERNS: typing.Final[typing.Sequence[re.Pattern]] = [
-        re.compile("$.*\-Cover^", re.IGNORECASE),
+        re.compile(r"$.*-Cover^", re.IGNORECASE),
         re.compile("cover", re.IGNORECASE),
     ]
 
     DIR_NAME_RE = re.compile(
-        "(?P<authors>.+?)(?= \- )"
-        + "(?: \- \[(?P<series_name>.*?) (?P<series_number>\d+)\])? \- "
-        + "(?P<title>.*$)"
+        r"(?P<authors>.+?)(?= - )"
+        + r"(?: - \[(?P<series_name>.*?) (?P<series_number>\d+)\])? - "
+        + r"(?P<title>.*$)"
     )
 
     @classmethod