build: require python3.9

For json support in sqlite.

Author: jtpavlock

.github/workflows/ci.yml

@@ -36,7 +36,7 @@ jobs:
     runs-on: ${{ matrix.platform }}
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.9", "3.10"]
         platform: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:

docs/conf.py

@@ -5,8 +5,6 @@
 https://www.sphinx-doc.org/en/master/usage/configuration.html
 """
 
-from typing import List
-
 import pkg_resources
 
 # -- Path setup --------------------------------------------------------------
@@ -62,4 +60,4 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path: List[str] = []
+html_static_path: list[str] = []

moe/cli.py

@@ -9,7 +9,7 @@
 import argparse
 import logging
 import sys
-from typing import List, Optional
+from typing import Optional
 
 import pkg_resources
 import pluggy
@@ -101,7 +101,7 @@ def add_hooks(plugin_manager: pluggy.manager.PluginManager):
     plugin_manager.add_hookspecs(Hooks)
 
 
-def main(args: List[str] = sys.argv[1:], config: Optional[Config] = None):
+def main(args: list[str] = sys.argv[1:], config: Optional[Config] = None):
     """Runs the CLI."""
     log.debug(f"Commandline arguments received. [{args=!r}]")
 
@@ -118,7 +118,7 @@ def main(args: List[str] = sys.argv[1:], config: Optional[Config] = None):
     main()
 
 
-def _parse_args(args: List[str], config: Config):
+def _parse_args(args: list[str], config: Config):
     """Parses the commandline arguments.
 
     Args:

moe/config.py

@@ -20,7 +20,7 @@
 from contextlib import suppress
 from pathlib import Path
 from types import ModuleType
-from typing import Any, List, NamedTuple, Optional, Type, Union
+from typing import Any, NamedTuple, Optional, Union
 
 import dynaconf
 import pluggy
@@ -98,7 +98,7 @@ def add_hooks(plugin_manager: pluggy.manager.PluginManager):
 
     @staticmethod
     @moe.hookspec
-    def edit_new_items(config: "Config", items: List[LibItem]):
+    def edit_new_items(config: "Config", items: list[LibItem]):
         """Edit any new or changed items prior to them being added to the library.
 
         Args:
@@ -114,7 +114,7 @@ def edit_new_items(config: "Config", items: List[LibItem]):
 
     @staticmethod
     @moe.hookspec
-    def process_new_items(config: "Config", items: List[LibItem]):
+    def process_new_items(config: "Config", items: list[LibItem]):
         """Process any new or changed items after they have been added to the library.
 
         Args:
@@ -191,7 +191,7 @@ class ExtraPlugin(NamedTuple):
         name: Name to register the plugin under.
     """
 
-    plugin: Union[Type, ModuleType]
+    plugin: Union[type, ModuleType]
     name: str
 
 
@@ -219,7 +219,7 @@ def __init__(
         self,
         config_dir: Path = Path.home() / ".config" / "moe",  # noqa: B008
         settings_filename: str = "config.toml",
-        extra_plugins: Optional[List[ExtraPlugin]] = None,
+        extra_plugins: Optional[list[ExtraPlugin]] = None,
         engine: Optional[sqlalchemy.engine.base.Engine] = None,
         init_db=True,
     ):

moe/library/album.py

@@ -3,7 +3,7 @@
 import datetime
 import logging
 from pathlib import Path
-from typing import TYPE_CHECKING, List, Optional, Tuple, Type, TypeVar, cast
+from typing import TYPE_CHECKING, Optional, TypeVar, cast
 
 import sqlalchemy as sa
 from sqlalchemy import Column, Date, Integer, String, and_, or_
@@ -46,11 +46,11 @@ class Album(LibItem, SABase):
         artist (str): AKA albumartist.
         date (datetime.date): Album release date.
         disc_total (int): Number of discs in the album.
-        extras (List[Extra]): Extra non-track files associated with the album.
+        extras (list[Extra]): Extra non-track files associated with the album.
         mb_album_id (str): Musicbrainz album aka release id.
         path (Path): Filesystem path of the album directory.
         title (str)
-        tracks (List[Track]): Album's corresponding tracks.
+        tracks (list[Track]): Album's corresponding tracks.
         year (int): Album release year.
     """
 
@@ -64,13 +64,13 @@ class Album(LibItem, SABase):
     path: Path = cast(Path, Column(PathType, nullable=False, unique=True))
     title: str = cast(str, Column(String, nullable=False))
 
-    tracks: "List[Track]" = relationship(
+    tracks: list["Track"] = relationship(
         "Track",
         back_populates="album_obj",
         cascade="all, delete-orphan",
         collection_class=list,
     )
-    extras: "List[Extra]" = relationship(
+    extras: list["Extra"] = relationship(
         "Extra",
         back_populates="album_obj",
         cascade="all, delete-orphan",
@@ -109,7 +109,7 @@ def __init__(
         log.debug(f"Album created. [album={self!r}]")
 
     @classmethod
-    def from_dir(cls: Type[A], album_path: Path) -> A:
+    def from_dir(cls: type[A], album_path: Path) -> A:
         """Creates an album from a directory.
 
         Args:
@@ -149,7 +149,7 @@ def from_dir(cls: Type[A], album_path: Path) -> A:
         log.debug(f"Album created from directory. [dir={album_path}, {album=!r}]")
         return album
 
-    def fields(self) -> Tuple[str, ...]:
+    def fields(self) -> tuple[str, ...]:
         """Returns the public fields, or non-method attributes, of an Album."""
         return (
             "artist",
@@ -228,7 +228,7 @@ def merge(self, other: "Album", overwrite: bool = False) -> None:
                 if other_value and (overwrite or (not overwrite and not self_value)):
                     setattr(self, field, other_value)
 
-        new_tracks: List["Track"] = []
+        new_tracks: list[Track] = []
         for other_track in other.tracks:
             conflict_track = self.get_track(other_track.track_num, other_track.disc)
             if conflict_track:
@@ -237,7 +237,7 @@ def merge(self, other: "Album", overwrite: bool = False) -> None:
                 new_tracks.append(other_track)
         self.tracks.extend(new_tracks)
 
-        new_extras: List["Extra"] = []
+        new_extras: list[Extra] = []
         for other_extra in other.extras:
             conflict_extra = self.get_extra(other_extra.filename)
             if conflict_extra and overwrite:

moe/library/extra.py

@@ -2,7 +2,7 @@
 
 import logging
 from pathlib import Path
-from typing import TYPE_CHECKING, Optional, Tuple, cast
+from typing import TYPE_CHECKING, Optional, cast
 
 from sqlalchemy import Column, Integer
 from sqlalchemy.orm import joinedload, relationship
@@ -60,7 +60,7 @@ def filename(self) -> str:
         """Gets an Extra's filename."""
         return self.path.name
 
-    def fields(self) -> Tuple[str, ...]:
+    def fields(self) -> tuple[str, ...]:
         """Returns the public fields, or non-method attributes, of an Extra."""
         return "filename", "path"
 

moe/library/lib_item.py

@@ -1,7 +1,6 @@
 """Shared functionality between library albums, extras, and tracks."""
 
 from pathlib import Path
-from typing import Tuple
 
 import sqlalchemy as sa
 
@@ -16,7 +15,7 @@ def path(self):
         """A library item's filesystem path."""
         raise NotImplementedError
 
-    def fields(self) -> Tuple[str, ...]:
+    def fields(self) -> tuple[str, ...]:
         """Returns the public attributes of an item."""
         raise NotImplementedError
 

moe/library/track.py

@@ -3,7 +3,7 @@
 import datetime
 import logging
 from pathlib import Path
-from typing import List, Optional, Tuple, Type, TypeVar, cast
+from typing import Optional, TypeVar, cast
 
 import mediafile
 import sqlalchemy.orm as sa_orm
@@ -62,7 +62,7 @@ class Track(LibItem, SABase):
         disc (int): Disc number the track is on.
         disc_total (int): Number of discs in the album.
         genre (str): String of all genres concatenated with ';'.
-        genres (List[str]): List of all genres.
+        genres (list[str]): List of all genres.
         mb_album_id (str): Musicbrainz album aka release ID.
         mb_track_id (str): Musicbrainz track ID.
         path (Path): Filesystem path of the track file.
@@ -94,13 +94,13 @@ class Track(LibItem, SABase):
     mb_album_id: str = association_proxy("album_obj", "mb_album_id")
     year: int = association_proxy("album_obj", "year")
 
-    _genres: List[_Genre] = relationship(
+    _genres: list[_Genre] = relationship(
         "_Genre",
         secondary=track_genre,
         collection_class=list,
         cascade="save-update, merge, expunge",
     )
-    genres: List[str] = association_proxy("_genres", "name")
+    genres: list[str] = association_proxy("_genres", "name")
 
     __table_args__ = (UniqueConstraint("disc", "track_num", "_album_id"),)
 
@@ -145,28 +145,28 @@ def _guess_disc(self) -> int:
             return 1
 
         # The track is in a subdirectory of the album - most likely disc directories.
-        disc_dirs: List[Path] = []
+        disc_dirs: list[Path] = []
         for path in self.album_obj.path.iterdir():
             if not path.is_dir():
                 continue
 
             contains_tracks = False
             for album_track in self.album_obj.tracks:
-                if path in album_track.path.parents:
+                if album_track.path.is_relative_to(path):
                     contains_tracks = True
 
             if contains_tracks:
                 disc_dirs.append(path)
 
         # Guess the disc by the order of the disc directory it appears in.
         for disc_num, disc_dir in enumerate(sorted(disc_dirs), start=1):
-            if disc_dir in self.path.parents:
+            if self.path.is_relative_to(disc_dir):
                 return disc_num
 
         return 1
 
     @classmethod
-    def from_file(cls: Type[T], track_path: Path, album: Optional[Album] = None) -> T:
+    def from_file(cls: type[T], track_path: Path, album: Optional[Album] = None) -> T:
         """Alternate initializer that creates a Track from a track file.
 
         Will read any tags from the given path and save them to the Track.
@@ -229,7 +229,7 @@ def genre(self, genre_str: str):
         """
         self.genres = [genre.strip() for genre in genre_str.split(";")]
 
-    def fields(self) -> Tuple[str, ...]:
+    def fields(self) -> tuple[str, ...]:
         """Returns the public fields, or non-method attributes, of a Track."""
         return (
             "album",

moe/plugins/add/add_cli.py

@@ -3,7 +3,7 @@
 import argparse
 import logging
 from pathlib import Path
-from typing import List, Union, cast
+from typing import Union, cast
 
 import moe
 import moe.cli
@@ -18,7 +18,7 @@
 
 log = logging.getLogger("moe.cli.add")
 
-__all__: List[str] = []
+__all__: list[str] = []
 
 
 @moe.hookimpl(hookwrapper=True)

moe/plugins/info.py

@@ -9,7 +9,7 @@
 import argparse
 import logging
 from collections import OrderedDict
-from typing import Any, Dict, List
+from typing import Any, Dict
 
 import moe
 import moe.cli
@@ -20,7 +20,7 @@
 from moe.library.track import Track
 from moe.query import QueryError, query
 
-__all__: List[str] = []
+__all__: list[str] = []
 
 log = logging.getLogger("moe.cli.info")
 
@@ -68,7 +68,7 @@ def _parse_args(config: Config, args: argparse.Namespace):
     print(_fmt_infos(items), end="")
 
 
-def _fmt_infos(items: List[LibItem]):
+def _fmt_infos(items: list[LibItem]):
     """Formats information for multiple items together."""
     out_str = ""
     for item in items:

moe/plugins/list.py

@@ -6,14 +6,13 @@
 
 import argparse
 import logging
-from typing import List
 
 import moe
 import moe.cli
 from moe.config import Config
 from moe.query import QueryError, query
 
-__all__: List[str] = []
+__all__: list[str] = []
 
 log = logging.getLogger("moe.cli.list")
 

moe/plugins/moe_import/import_cli.py

@@ -1,7 +1,6 @@
 """Import prompt."""
 
 import logging
-from typing import List
 
 import pluggy
 
@@ -26,7 +25,7 @@ class Hooks:
 
     @staticmethod
     @moe.hookspec
-    def add_import_prompt_choice(prompt_choices: List[PromptChoice]):
+    def add_import_prompt_choice(prompt_choices: list[PromptChoice]):
         """Add a user input choice to the import prompt.
 
         ``func`` should return the album to be added to the library (or ``None`` if no
@@ -76,7 +75,7 @@ def process_candidates(config: Config, old_album: Album, candidates):
 
 
 @moe.hookimpl
-def add_import_prompt_choice(prompt_choices: List[PromptChoice]):
+def add_import_prompt_choice(prompt_choices: list[PromptChoice]):
     """Adds the ``apply`` and ``abort`` prompt choices to the user prompt."""
     prompt_choices.append(
         PromptChoice(title="Apply changes", shortcut_key="a", func=_apply_changes)
@@ -106,7 +105,7 @@ def import_prompt(
 
     print(fmt_album_changes(old_album, new_album))
 
-    prompt_choices: List[PromptChoice] = []
+    prompt_choices: list[PromptChoice] = []
     config.plugin_manager.hook.add_import_prompt_choice(prompt_choices=prompt_choices)
 
     prompt_choice = choice_prompt(prompt_choices)

moe/plugins/moe_import/import_core.py

@@ -1,7 +1,6 @@
 """Core api for importing albums."""
 
 import logging
-from typing import List
 
 import pluggy
 
@@ -42,7 +41,7 @@ def import_candidates(config: Config, album: Album) -> Album:  # type: ignore
 
     @staticmethod
     @moe.hookspec
-    def process_candidates(config: Config, old_album: Album, candidates: List[Album]):
+    def process_candidates(config: Config, old_album: Album, candidates: list[Album]):
         """Process the imported candidate albums.
 
         If you wish to save and apply any candidate album metadata, it should be applied