Skip to content

Commit

Permalink
Revert "[python] mark chip cluster library as type checking ready"
Browse files Browse the repository at this point in the history
This reverts commit dac7abf.
  • Loading branch information
agners committed Sep 16, 2024
1 parent ac1e5a1 commit c5560d5
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 17 deletions.
7 changes: 0 additions & 7 deletions build/chip/python_wheel.gni
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,11 @@ 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")
Expand Down
3 changes: 0 additions & 3 deletions src/controller/python/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,6 @@ 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",
]
Expand All @@ -332,8 +331,6 @@ chip_python_wheel_action("chip-clusters") {
},
]

py_typed_packages = [ "chip.clusters" ]

inputs = []

py_packages = [
Expand Down
12 changes: 5 additions & 7 deletions src/controller/python/build-chip-wheel.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,6 @@ def has_ext_modules(foo):
# 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))
Expand All @@ -146,7 +140,11 @@ def has_ext_modules(foo):
# By default, look in the tmp directory for packages/modules to be included.
'': tmpDir,
},
package_data=package_data,
package_data={
packages[0]: [
libName
]
} if libName else {},
scripts=[name for name in map(
lambda script: os.path.join(tmpDir, script.installName),
installScripts
Expand Down
Empty file.

0 comments on commit c5560d5

Please sign in to comment.