tjh.dev
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
+2
-2
pkgs/development/python-modules/python-matter-server/default.nix
+2
-2
pkgs/development/python-modules/python-matter-server/default.nix
···
55
55
56
56
buildPythonPackage rec {
57
57
pname = "python-matter-server";
58
-
version = "5.8.1";
58
+
version = "5.9.0";
59
59
format = "pyproject";
60
60
61
61
disabled = pythonOlder "3.10";
···
64
64
owner = "home-assistant-libs";
65
65
repo = "python-matter-server";
66
66
rev = "refs/tags/${version}";
67
-
hash = "sha256-iisDEopaKklLvvGDTo2fv0Fpkhuhd+7KoNnQA+QmjB8=";
67
+
hash = "sha256-O3AJ7vBjuwRGa4AMwWIdxn5m2F45rLCjCHeff18b/5E=";
68
68
};
69
69
70
70
patches = [
+12
-13
pkgs/development/python-modules/python-matter-server/link-paa-root-certs.patch
+12
-13
pkgs/development/python-modules/python-matter-server/link-paa-root-certs.patch
···
1
1
diff --git a/matter_server/server/const.py b/matter_server/server/const.py
2
-
index 2a6140b..275353a 100644
2
+
index 8cca3cf..43f02f5 100644
3
3
--- a/matter_server/server/const.py
4
4
+++ b/matter_server/server/const.py
5
-
@@ -15,7 +15,8 @@ DATA_MODEL_SCHEMA_VERSION = 6
6
-
# and always uses the development subfolder
7
-
# regardless of anything you pass into instantiating the controller
8
-
# revisit this once matter 1.1 is released
9
-
-PAA_ROOT_CERTS_DIR: Final[pathlib.Path] = (
10
-
+PAA_ROOT_CERTS_DIR: Final[pathlib.Path] = pathlib.Path("@paacerts@")
5
+
@@ -14,6 +14,8 @@ DATA_MODEL_SCHEMA_VERSION = 6
6
+
# Keep default location inherited from early version of the Python
7
+
# bindings.
8
+
DEFAULT_PAA_ROOT_CERTS_DIR: Final[pathlib.Path] = (
9
+
+ pathlib.Path("@paacerts@"))
11
10
+(
12
11
pathlib.Path(__file__)
13
12
.parent.resolve()
14
13
.parent.resolve()
15
14
diff --git a/matter_server/server/helpers/paa_certificates.py b/matter_server/server/helpers/paa_certificates.py
16
-
index d186be1..d2cef54 100644
15
+
index e530838..fdd6025 100644
17
16
--- a/matter_server/server/helpers/paa_certificates.py
18
17
+++ b/matter_server/server/helpers/paa_certificates.py
19
-
@@ -62,6 +62,8 @@ async def fetch_dcl_certificates(
18
+
@@ -64,6 +64,8 @@ async def fetch_dcl_certificates(
20
19
fetch_production_certificates: bool = True,
21
20
) -> int:
22
21
"""Fetch DCL PAA Certificates."""
···
25
24
LOGGER.info("Fetching the latest PAA root certificates from DCL.")
26
25
fetch_count: int = 0
27
26
base_urls = set()
28
-
@@ -121,6 +123,8 @@ async def fetch_dcl_certificates(
27
+
@@ -124,6 +126,8 @@ async def fetch_dcl_certificates(
29
28
30
-
async def fetch_git_certificates() -> int:
29
+
async def fetch_git_certificates(paa_root_cert_dir: Path) -> int:
31
30
"""Fetch Git PAA Certificates."""
32
31
+ return 0
33
32
+
34
33
fetch_count = 0
35
34
LOGGER.info("Fetching the latest PAA root certificates from Git.")
36
35
37
-
@@ -162,6 +166,8 @@ async def fetch_certificates(
36
+
@@ -159,6 +163,8 @@ async def fetch_certificates(
38
37
fetch_production_certificates: bool = True,
39
38
) -> int:
40
39
"""Fetch PAA Certificates."""
···
42
41
+
43
42
loop = asyncio.get_running_loop()
44
43
45
-
if not PAA_ROOT_CERTS_DIR.is_dir():
44
+
if not paa_root_cert_dir.is_dir():