Chore: Bump to python 3.13
authorMarcel van der Veldt <m.vanderveldt@outlook.com>
Mon, 20 Jan 2025 19:57:38 +0000 (20:57 +0100)
committerMarcel van der Veldt <m.vanderveldt@outlook.com>
Mon, 20 Jan 2025 19:57:38 +0000 (20:57 +0100)
bump minimal python version to 3.12
prefer python 3.13

music_assistant/controllers/streams.py
music_assistant/controllers/webserver.py
music_assistant/helpers/webserver.py
music_assistant/mass.py
music_assistant/providers/siriusxm/__init__.py
pyproject.toml

index 56d55895c6edf87966fdd786b133ea0680bb51c1..9641b545d7a871ce87c24d7050986b532ef6fe79 100644 (file)
@@ -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"
index 77b60675630f3f3f606266cfeeb0bd0aff5289ac..492573f6d73086694cb2f61245a4d29985e91bdf 100644 (file)
@@ -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 = (
index fbdc6e4ee03befa25f6d18f1b29ac29736bbf52d..05183c5b74df07419924183ca0fe79f3c672f87b 100644 (file)
@@ -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)
index b4e83ea873551a959476431c01ebb1422e8c9719..675d4bc65936e587084a20a1bdd5ef002053a24a 100644 (file)
@@ -135,7 +135,6 @@ class MusicAssistant:
             loop=self.loop,
             connector=TCPConnector(
                 ssl=False,
-                enable_cleanup_closed=True,
                 limit=4096,
                 limit_per_host=100,
             ),
index b4016526fac8934bc28db664dde1eb7b6b0f9119..74fa2baab8e65dd1c7a5b7b5fa4edd9567ae95d3 100644 (file)
@@ -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,
index 2aa638d4fa71a8ce26a9fe338d718c04d11e9861..998ef08d6c60f9ca4d4dd4e5c702efb7b82be1d3 100644 (file)
@@ -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]