From: Jonathan Date: Tue, 8 Aug 2023 13:44:30 +0000 (+0200) Subject: Merge branch 'main' into async-deezer-python-lib X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=18d2311434e03f65bdfa1ca04b27729310623da7;p=music-assistant-server.git Merge branch 'main' into async-deezer-python-lib --- 18d2311434e03f65bdfa1ca04b27729310623da7 diff --cc music_assistant/server/providers/deezer/__init__.py index f61efc76,fa1e93d4..107e2ad0 --- a/music_assistant/server/providers/deezer/__init__.py +++ b/music_assistant/server/providers/deezer/__init__.py @@@ -1,9 -1,9 +1,11 @@@ """Deezer music provider support for MusicAssistant.""" + import datetime import hashlib + import uuid from asyncio import TaskGroup from collections.abc import AsyncGenerator +from dataclasses import dataclass +from itertools import islice from math import ceil from typing import Any diff --cc requirements_all.txt index b3593243,2576a325..61af2ffd --- a/requirements_all.txt +++ b/requirements_all.txt @@@ -14,12 -14,12 +14,12 @@@ cryptography==41.0. faust-cchardet>=2.1.18 git+https://github.com/MarvinSchenkel/pytube.git git+https://github.com/gieljnssns/python-radios.git@main +git+https://github.com/music-assistant/deezer-python-async ifaddr==0.2.0 - mashumaro==3.8.1 + mashumaro==3.9 memory-tempfile==2.2.3 music-assistant-frontend==2.0.13 - orjson==3.9.2 + orjson==3.9.3 pillow==10.0.0 plexapi==4.15.0 PyChromecast==13.0.7