Merge branch 'Taxel:main' into main

.envrc

@@ -1,4 +1,4 @@
-layout python python3.8
+layout python python3.9
 
 # Pipenv found itself running within a virtual environment,
 # so it will automatically use that environment,

.github/workflows/pypi.yml

@@ -13,7 +13,7 @@ on:
       - "*.*.*"
 
 env:
-  DEFAULT_PYTHON: 3.8
+  DEFAULT_PYTHON: 3.9
 
 jobs:
   pypi:

.github/workflows/test.yml

@@ -4,7 +4,7 @@ on:
   workflow_call:
 
 env:
-  DEFAULT_PYTHON: 3.8
+  DEFAULT_PYTHON: 3.9
 
 jobs:
   test:

Dockerfile

@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1.3-labs
-ARG PYTHON_VERSION=3.12
-FROM python:3.12-alpine3.19 AS base
+ARG PYTHON_VERSION=3.13
+FROM python:$PYTHON_VERSION-alpine3.19 AS base
 ENV PIP_DISABLE_PIP_VERSION_CHECK=1 PIP_ROOT_USER_ACTION=ignore
 WORKDIR /app
 

Pipfile

@@ -6,15 +6,15 @@ verify_ssl = true
 [dev-packages]
 
 [packages]
-apluggy = "==0.9.4"
+apluggy = "==1.0.3"
 attrs = "==24.2.0"
 cattrs = {version="==24.1.2", python_version=">='3.7'"}
 certifi = "==2024.8.30"
 charset-normalizer = "==3.4.0"
 click = "==8.1.7"
 decorator = "==5.1.1"
 deprecated = "==1.2.14"
-humanize = "==4.10.0"
+humanize = "==4.11.0"
 idna = {version="==3.10", python_version=">='3.5'"}
 inquirerpy = "==0.3.4"
 markdown-it-py = {version="==3.0.0", python_version=">='3.7'"}

README.md

@@ -57,7 +57,7 @@ have a file containing those on your harddrive, you can not use this project.
   - [Good practices](#good-practices)
   - [Troubleshooting](#troubleshooting)
 
-[python-versions-badge]: https://img.shields.io/badge/python-3.8%20%7C%203.9%20%7C%203.10%20%7C%203.11%20%7C%203.12-blue
+[python-versions-badge]: https://img.shields.io/badge/python-3.9%20%7C%203.10%20%7C%203.11%20%7C%203.12-blue
 
 ## Features
 
@@ -74,7 +74,7 @@ have a file containing those on your harddrive, you can not use this project.
 
 ## Pre-requisites
 
-The script is known to work with Python 3.8-3.12 versions.
+The script is known to work with Python 3.9-3.12 versions.
 
 ## Installation
 

plextraktsync/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.31.0dev0"
+__version__ = "0.32.0dev0"

plextraktsync/commands/cache.py

@@ -6,7 +6,8 @@
 from plextraktsync.factory import factory
 
 if TYPE_CHECKING:
-    from typing import Any, Generator
+    from collections.abc import Generator
+    from typing import Any
 
     from requests_cache import CachedRequest, CachedSession
 
@@ -42,12 +43,7 @@ def render_xml(data):
         return None
 
     root = ElementTree.fromstring(data)
-    import contextlib
-
-    with contextlib.suppress(AttributeError):
-        # requires python 3.9
-        # https://stackoverflow.com/a/39482716/2314626
-        ElementTree.indent(root)
+    ElementTree.indent(root)
 
     return ElementTree.tostring(root, encoding="utf8").decode("utf8")
 

plextraktsync/plan/Walker.py

@@ -12,7 +12,8 @@
 from plextraktsync.trakt.TraktItem import TraktItem
 
 if TYPE_CHECKING:
-    from typing import Any, AsyncGenerator, AsyncIterable, Generator, Iterable
+    from collections.abc import AsyncGenerator, AsyncIterable, Generator, Iterable
+    from typing import Any
 
     from plexapi.video import Episode
 

plextraktsync/plex/PlexApi.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from datetime import datetime
-from functools import cached_property
+from functools import cache, cached_property
 from typing import TYPE_CHECKING
 
 import plexapi
@@ -10,7 +10,6 @@
 from plexapi.server import SystemAccount, SystemDevice
 
 from plextraktsync.decorators.flatten import flatten_dict, flatten_list
-from plextraktsync.decorators.memoize import memoize
 from plextraktsync.decorators.retry import retry
 from plextraktsync.factory import factory, logging
 from plextraktsync.plex.PlexId import PlexId
@@ -162,11 +161,11 @@ def library_sections(self) -> dict[int, PlexLibrarySection]:
 
             yield section.key, PlexLibrarySection(section, plex=self)
 
-    @memoize
+    @cache
     def system_device(self, device_id: int) -> SystemDevice:
         return self.server.systemDevice(device_id)
 
-    @memoize
+    @cache
     def system_account(self, account_id: int) -> SystemAccount:
         return self.server.systemAccount(account_id)
 

plextraktsync/plex/PlexRatings.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
+from functools import cache
 from typing import TYPE_CHECKING
 
 from plextraktsync.decorators.flatten import flatten_dict
-from plextraktsync.decorators.memoize import memoize
 from plextraktsync.util.Rating import Rating
 
 if TYPE_CHECKING:
@@ -34,7 +34,7 @@ def get(self, m: PlexLibraryItem, show_id: int = None):
         return ratings.get(m.item.ratingKey, None)
 
     @staticmethod
-    @memoize
+    @cache
     @flatten_dict
     def ratings(section: PlexLibrarySection, media_type: str):
         key = {

plextraktsync/sync/ClearCollectedPlugin.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Iterable
+from collections.abc import Iterable
+from typing import TYPE_CHECKING
 
 from plextraktsync.factory import logging
 from plextraktsync.media.Media import Media

plextraktsync/trakt/trakt_set.py

@@ -3,7 +3,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from typing import Iterable
+    from collections.abc import Iterable
 
     from plextraktsync.trakt.types import TraktMedia
 

pyproject.toml

@@ -19,13 +19,12 @@ classifiers = [
   # https://en.wikipedia.org/wiki/History_of_Python#Support
   # https://endoflife.date/python
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 
 [tool.setuptools.dynamic]
 version = {attr = "plextraktsync.__version__"}

requirements.txt

@@ -1,14 +1,14 @@
 -i https://pypi.org/simple
-apluggy==0.9.4
+apluggy==1.0.3; python_version >= '3.9'
 attrs==24.2.0; python_version >= '3.7'
 cattrs==24.1.2; python_version >= '3.8'
 certifi==2024.8.30; python_version >= '3.6'
 charset-normalizer==3.4.0; python_full_version >= '3.7.0'
 click==8.1.7
-decorator==5.1.1
+decorator==5.1.1; python_version >= '3.5'
 deprecated==1.2.14
 exceptiongroup==1.2.2; python_version >= '3.7'
-humanize==4.10.0; python_version >= '3.8'
+humanize==4.11.0; python_version >= '3.9'
 idna==3.10; python_version >= '3.6'
 inquirerpy==0.3.4
 markdown-it-py==3.0.0; python_version >= '3.7' and python_version >= '3.8'
@@ -17,7 +17,7 @@ oauthlib==3.2.2
 pfzy==0.3.4; python_version >= '3.7' and python_version < '4.0'
 platformdirs==4.3.6; python_version >= '3.8'
 plexapi==4.15.16; python_version >= '3.8'
-pluggy==1.5.0
+pluggy==1.5.0; python_version >= '3.8'
 prompt-toolkit==3.0.48; python_full_version >= '3.7.0'
 pygments==2.18.0; python_version >= '3.8'
 python-dotenv==1.0.1