From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Mon, 20 Jan 2025 19:57:38 +0000 (+0100)
Subject: Chore: Bump to python 3.13
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=b4c307c0161d11813d044ce79ee6d695a1150675;p=music-assistant-server.git

Chore: Bump to python 3.13

bump minimal python version to 3.12
prefer python 3.13
---

diff --git a/music_assistant/controllers/streams.py b/music_assistant/controllers/streams.py
index 56d55895..9641b545 100644
--- a/music_assistant/controllers/streams.py
+++ b/music_assistant/controllers/streams.py
@@ -96,7 +96,7 @@ class StreamsController(CoreController):
     def __init__(self, *args, **kwargs) -> None:
         """Initialize instance."""
         super().__init__(*args, **kwargs)
-        self._server = Webserver(self.mass, self.logger, enable_dynamic_routes=True)
+        self._server = Webserver(self.logger, enable_dynamic_routes=True)
         self.register_dynamic_route = self._server.register_dynamic_route
         self.unregister_dynamic_route = self._server.unregister_dynamic_route
         self.manifest.name = "Streamserver"
diff --git a/music_assistant/controllers/webserver.py b/music_assistant/controllers/webserver.py
index 77b60675..492573f6 100644
--- a/music_assistant/controllers/webserver.py
+++ b/music_assistant/controllers/webserver.py
@@ -56,7 +56,7 @@ class WebserverController(CoreController):
     def __init__(self, *args, **kwargs) -> None:
         """Initialize instance."""
         super().__init__(*args, **kwargs)
-        self._server = Webserver(self.mass, self.logger, enable_dynamic_routes=False)
+        self._server = Webserver(self.logger, enable_dynamic_routes=False)
         self.clients: set[WebsocketClientHandler] = set()
         self.manifest.name = "Web Server (frontend and api)"
         self.manifest.description = (
diff --git a/music_assistant/helpers/webserver.py b/music_assistant/helpers/webserver.py
index fbdc6e4e..05183c5b 100644
--- a/music_assistant/helpers/webserver.py
+++ b/music_assistant/helpers/webserver.py
@@ -11,7 +11,6 @@ if TYPE_CHECKING:
     import logging
     from collections.abc import Awaitable, Callable
 
-    from music_assistant.mass import MusicAssistant
 
 MAX_CLIENT_SIZE: Final = 1024**2 * 16
 MAX_LINE_SIZE: Final = 24570
@@ -22,12 +21,10 @@ class Webserver:
 
     def __init__(
         self,
-        mass: MusicAssistant,
         logger: logging.Logger,
         enable_dynamic_routes: bool = False,
     ) -> None:
         """Initialize instance."""
-        self.mass = mass
         self.logger = logger
         # the below gets initialized in async setup
         self._apprunner: web.AppRunner | None = None
@@ -56,7 +53,6 @@ class Webserver:
                 "max_line_size": MAX_LINE_SIZE,
                 "max_field_size": MAX_LINE_SIZE,
             },
-            loop=self.mass.loop,
         )
         self.logger.info("Starting server on  %s:%s - base url: %s", bind_ip, bind_port, base_url)
         self._apprunner = web.AppRunner(self._webapp, access_log=None, shutdown_timeout=10)
diff --git a/music_assistant/mass.py b/music_assistant/mass.py
index b4e83ea8..675d4bc6 100644
--- a/music_assistant/mass.py
+++ b/music_assistant/mass.py
@@ -135,7 +135,6 @@ class MusicAssistant:
             loop=self.loop,
             connector=TCPConnector(
                 ssl=False,
-                enable_cleanup_closed=True,
                 limit=4096,
                 limit_per_host=100,
             ),
diff --git a/music_assistant/providers/siriusxm/__init__.py b/music_assistant/providers/siriusxm/__init__.py
index b4016526..74fa2baa 100644
--- a/music_assistant/providers/siriusxm/__init__.py
+++ b/music_assistant/providers/siriusxm/__init__.py
@@ -162,7 +162,7 @@ class SiriusXMProvider(MusicProvider):
         self._base_url = f"{bind_ip}:{bind_port}"
         http_handler = sxm.http.make_http_handler(self._client)
 
-        self._sxm_server = Webserver(self.mass, self.logger)
+        self._sxm_server = Webserver(self.logger)
 
         await self._sxm_server.setup(
             bind_ip=bind_ip,
diff --git a/pyproject.toml b/pyproject.toml
index 2aa638d4..998ef08d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -38,7 +38,7 @@ dependencies = [
 description = "Music Assistant"
 license = {text = "Apache-2.0"}
 readme = "README.md"
-requires-python = ">=3.11"
+requires-python = ">=3.12"
 version = "0.0.0"
 
 [project.optional-dependencies]