-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Also add a patch to mark the CHIP cluster library as ready for type checking.
- Loading branch information
Showing
4 changed files
with
96 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
From 7105b8d215750e60fc872af5d8c5903e61a806c9 Mon Sep 17 00:00:00 2001 | ||
Message-ID: <7105b8d215750e60fc872af5d8c5903e61a806c9.1696858281[email protected]> | ||
From d06671d9031156ce3b29e06d7edb344d8f6ee0d6 Mon Sep 17 00:00:00 2001 | ||
Message-ID: <d06671d9031156ce3b29e06d7edb344d8f6ee0d6.1698086809[email protected]> | ||
From: Stefan Agner <[email protected]> | ||
Date: Tue, 22 Nov 2022 10:51:17 +0100 | ||
Subject: [PATCH] Support custom platform tag | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From 0099f338e0fb740bd4fb2f34b315bca918e9b257 Mon Sep 17 00:00:00 2001 | ||
Message-ID: <0099f338e0fb740bd4fb2f34b315bca918e9b257.1696858281[email protected]> | ||
In-Reply-To: <7105b8d215750e60fc872af5d8c5903e61a806c9.1696858281[email protected]> | ||
References: <7105b8d215750e60fc872af5d8c5903e61a806c9.1696858281[email protected]> | ||
From 88ba0f8233f97a9bb773341da7c996deee9675fe Mon Sep 17 00:00:00 2001 | ||
Message-ID: <88ba0f8233f97a9bb773341da7c996deee9675fe.1698086809[email protected]> | ||
In-Reply-To: <d06671d9031156ce3b29e06d7edb344d8f6ee0d6.1698086809[email protected]> | ||
References: <d06671d9031156ce3b29e06d7edb344d8f6ee0d6.1698086809[email protected]> | ||
From: Stefan Agner <[email protected]> | ||
Date: Fri, 27 May 2022 16:38:14 +0200 | ||
Subject: [PATCH] Use /data as platform storage location | ||
|
@@ -11,7 +11,7 @@ Subject: [PATCH] Use /data as platform storage location | |
1 file changed, 6 insertions(+) | ||
|
||
diff --git a/src/platform/Linux/BUILD.gn b/src/platform/Linux/BUILD.gn | ||
index 56324ff5c4..066bde076a 100644 | ||
index a2cfa6b39c..f6fd74ab0c 100644 | ||
--- a/src/platform/Linux/BUILD.gn | ||
+++ b/src/platform/Linux/BUILD.gn | ||
@@ -38,6 +38,12 @@ if (chip_mdns == "platform") { | ||
|
88 changes: 88 additions & 0 deletions
88
0003-python-mark-chip-cluster-library-as-type-checking-re.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,88 @@ | ||
From c98b4529584eb42b8c0459bf031ad6cc130f584e Mon Sep 17 00:00:00 2001 | ||
Message-ID: <c98b4529584eb42b8c0459bf031ad6cc130f584e.1698086809.git.stefan@agner.ch> | ||
In-Reply-To: <d06671d9031156ce3b29e06d7edb344d8f6ee0d6.1698086809.git.stefan@agner.ch> | ||
References: <d06671d9031156ce3b29e06d7edb344d8f6ee0d6.1698086809.git.stefan@agner.ch> | ||
From: Stefan Agner <[email protected]> | ||
Date: Mon, 23 Oct 2023 20:36:06 +0200 | ||
Subject: [PATCH] [python] mark chip cluster library as type checking ready | ||
|
||
--- | ||
src/controller/python/BUILD.gn | 12 ++++++++++++ | ||
src/controller/python/build-chip-wheel.py | 12 +++++++----- | ||
2 files changed, 19 insertions(+), 5 deletions(-) | ||
|
||
diff --git a/src/controller/python/BUILD.gn b/src/controller/python/BUILD.gn | ||
index b01dafbc30..58e6c8c487 100644 | ||
--- a/src/controller/python/BUILD.gn | ||
+++ b/src/controller/python/BUILD.gn | ||
@@ -184,11 +184,18 @@ template("chip_python_wheel_action") { | ||
_py_scripts = [] | ||
} | ||
|
||
+ if (defined(invoker.py_typed_packages)) { | ||
+ _py_typed_packages = py_typed_packages | ||
+ } else { | ||
+ _py_typed_packages = { } | ||
+ } | ||
+ | ||
_py_manifest = { | ||
files = _py_manifest_files_rebased | ||
packages = py_packages | ||
scripts = _py_scripts | ||
package_reqs = py_package_reqs | ||
+ typed_packages = _py_typed_packages | ||
} | ||
|
||
write_file(_py_manifest_file, _py_manifest, "json") | ||
@@ -379,6 +386,7 @@ chip_python_wheel_action("chip-clusters") { | ||
"chip/clusters/TestObjects.py", | ||
"chip/clusters/Types.py", | ||
"chip/clusters/enum.py", | ||
+ "chip/clusters/py.typed", | ||
"chip/tlv/__init__.py", | ||
"chip/tlv/tlvlist.py", | ||
] | ||
@@ -389,6 +397,10 @@ chip_python_wheel_action("chip-clusters") { | ||
}, | ||
] | ||
|
||
+ py_typed_packages = [ | ||
+ "chip.clusters", | ||
+ ] | ||
+ | ||
inputs = [] | ||
|
||
py_packages = [ | ||
diff --git a/src/controller/python/build-chip-wheel.py b/src/controller/python/build-chip-wheel.py | ||
index 7b21215bdc..92a0f583ca 100644 | ||
--- a/src/controller/python/build-chip-wheel.py | ||
+++ b/src/controller/python/build-chip-wheel.py | ||
@@ -115,6 +115,12 @@ try: | ||
# Build the chip package... | ||
# | ||
packages = manifest['packages'] | ||
+ package_data = {} | ||
+ for package in manifest['typed_packages']: | ||
+ package_data[package] = [ "py.typed" ] | ||
+ | ||
+ if libName: | ||
+ package_data[packages[0]]: [ libName ] | ||
|
||
print("packageName: {}".format(packageName)) | ||
print("libName: {}".format(libName)) | ||
@@ -140,11 +146,7 @@ try: | ||
# By default, look in the tmp directory for packages/modules to be included. | ||
'': tmpDir, | ||
}, | ||
- package_data={ | ||
- packages[0]: [ | ||
- libName | ||
- ] | ||
- } if libName else {}, | ||
+ package_data=package_data, | ||
scripts=[name for name in map( | ||
lambda script: os.path.join(tmpDir, script.installName), | ||
installScripts | ||
-- | ||
2.42.0 | ||
|