python-matter-server: 5.8.1 -> 5.9.0

Release notes: https://github.com/home-assistant-libs/python-matter-server/releases/tag/5.9.0
This commit is contained in:
Matt Leon 2024-03-28 19:31:40 -04:00
parent d8fe5e6c92
commit 204ccc2323
No known key found for this signature in database
GPG key ID: 6ACFFB39D38451B3
2 changed files with 14 additions and 15 deletions

View file

@ -55,7 +55,7 @@ in
buildPythonPackage rec {
pname = "python-matter-server";
version = "5.8.1";
version = "5.9.0";
format = "pyproject";
disabled = pythonOlder "3.10";
@ -64,7 +64,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = "python-matter-server";
rev = "refs/tags/${version}";
hash = "sha256-iisDEopaKklLvvGDTo2fv0Fpkhuhd+7KoNnQA+QmjB8=";
hash = "sha256-O3AJ7vBjuwRGa4AMwWIdxn5m2F45rLCjCHeff18b/5E=";
};
patches = [

View file

@ -1,22 +1,21 @@
diff --git a/matter_server/server/const.py b/matter_server/server/const.py
index 2a6140b..275353a 100644
index 8cca3cf..43f02f5 100644
--- a/matter_server/server/const.py
+++ b/matter_server/server/const.py
@@ -15,7 +15,8 @@ DATA_MODEL_SCHEMA_VERSION = 6
# and always uses the development subfolder
# regardless of anything you pass into instantiating the controller
# revisit this once matter 1.1 is released
-PAA_ROOT_CERTS_DIR: Final[pathlib.Path] = (
+PAA_ROOT_CERTS_DIR: Final[pathlib.Path] = pathlib.Path("@paacerts@")
@@ -14,6 +14,8 @@ DATA_MODEL_SCHEMA_VERSION = 6
# Keep default location inherited from early version of the Python
# bindings.
DEFAULT_PAA_ROOT_CERTS_DIR: Final[pathlib.Path] = (
+ pathlib.Path("@paacerts@"))
+(
pathlib.Path(__file__)
.parent.resolve()
.parent.resolve()
diff --git a/matter_server/server/helpers/paa_certificates.py b/matter_server/server/helpers/paa_certificates.py
index d186be1..d2cef54 100644
index e530838..fdd6025 100644
--- a/matter_server/server/helpers/paa_certificates.py
+++ b/matter_server/server/helpers/paa_certificates.py
@@ -62,6 +62,8 @@ async def fetch_dcl_certificates(
@@ -64,6 +64,8 @@ async def fetch_dcl_certificates(
fetch_production_certificates: bool = True,
) -> int:
"""Fetch DCL PAA Certificates."""
@ -25,16 +24,16 @@ index d186be1..d2cef54 100644
LOGGER.info("Fetching the latest PAA root certificates from DCL.")
fetch_count: int = 0
base_urls = set()
@@ -121,6 +123,8 @@ async def fetch_dcl_certificates(
@@ -124,6 +126,8 @@ async def fetch_dcl_certificates(
async def fetch_git_certificates() -> int:
async def fetch_git_certificates(paa_root_cert_dir: Path) -> int:
"""Fetch Git PAA Certificates."""
+ return 0
+
fetch_count = 0
LOGGER.info("Fetching the latest PAA root certificates from Git.")
@@ -162,6 +166,8 @@ async def fetch_certificates(
@@ -159,6 +163,8 @@ async def fetch_certificates(
fetch_production_certificates: bool = True,
) -> int:
"""Fetch PAA Certificates."""
@ -42,4 +41,4 @@ index d186be1..d2cef54 100644
+
loop = asyncio.get_running_loop()
if not PAA_ROOT_CERTS_DIR.is_dir():
if not paa_root_cert_dir.is_dir():