Skip to content

Commit 0726e76

Browse files
arkqrestyled-commitsgemini-code-assist[bot]Copilot
authored
Rename chip-repl to matter-repl (project-chip#40751)
* Format device node ID as hex just like in core SDK * Rename chip-repl to matter-repl * Properly define dependencies between matter-* packages * Make matter-repl banner more compact * Restyled by prettier-markdown * Update src/controller/python/matter/ReplStartup.py Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> * Update src/controller/python/matter/yaml/runner.py Co-authored-by: Copilot <[email protected]> * Fix markdown codeblock lexer issues * Fix scripts/build_python_device.sh * Install all matter packages at once --------- Co-authored-by: Restyled.io <[email protected]> Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Co-authored-by: Copilot <[email protected]>
1 parent fe63135 commit 0726e76

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+368
-366
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -365,9 +365,7 @@ jobs:
365365
scripts/run_in_build_env.sh 'virtualenv pyenv'
366366
source pyenv/bin/activate
367367
python -m ensurepip --upgrade
368-
python -m pip install ./out/controller/python/matter_core-1.0.0-cp37-abi3-linux_x86_64.whl
369-
python -m pip install ./out/controller/python/matter_clusters-1.0.0-py3-none-any.whl
370-
python -m pip install ./out/controller/python/matter_repl-1.0.0-py3-none-any.whl
368+
python -m pip install out/controller/python/matter*.whl
371369
372370
- name: Run Python tests
373371
shell: bash

.github/workflows/tests.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -357,12 +357,12 @@ jobs:
357357
--all-clusters-app ./out/linux-x64-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \
358358
"
359359
360-
- name: Run Tests using chip-repl (skip slow)
360+
- name: Run Tests using matter-repl (skip slow)
361361
if: github.event_name == 'pull_request'
362362
run: |
363363
./scripts/run_in_python_env.sh out/venv \
364364
"./scripts/tests/run_test_suite.py \
365-
--runner chip_repl_python \
365+
--runner matter_repl_python \
366366
--exclude-tags MANUAL \
367367
--exclude-tags FLAKY \
368368
--exclude-tags IN_DEVELOPMENT \
@@ -385,12 +385,12 @@ jobs:
385385
--energy-gateway-app ./out/linux-x64-energy-gateway-${BUILD_VARIANT}/chip-energy-gateway-app \
386386
--energy-management-app ./out/linux-x64-energy-management-${BUILD_VARIANT}/chip-energy-management-app \
387387
"
388-
- name: Run Tests using chip-repl (including slow)
388+
- name: Run Tests using matter-repl (including slow)
389389
if: github.event_name == 'push'
390390
run: |
391391
./scripts/run_in_python_env.sh out/venv \
392392
"./scripts/tests/run_test_suite.py \
393-
--runner chip_repl_python \
393+
--runner matter_repl_python \
394394
run \
395395
--iterations 1 \
396396
--test-timeout-seconds 120 \
@@ -863,10 +863,10 @@ jobs:
863863
ln -s linux-x64-all-clusters-${BUILD_VARIANT}-clang-test out/linux-x64-all-clusters
864864
865865
scripts/run_in_python_env.sh out/venv \
866-
"jupyter execute docs/development_controllers/chip-repl/Matter_REPL_Intro.ipynb \
867-
docs/development_controllers/chip-repl/Matter_Basic_Interactions.ipynb \
868-
docs/development_controllers/chip-repl/Matter_Access_Control.ipynb \
869-
docs/development_controllers/chip-repl/Matter_Multi_Fabric_Commissioning.ipynb \
866+
"jupyter execute docs/development_controllers/matter-repl/Matter_REPL_Intro.ipynb \
867+
docs/development_controllers/matter-repl/Matter_Basic_Interactions.ipynb \
868+
docs/development_controllers/matter-repl/Matter_Access_Control.ipynb \
869+
docs/development_controllers/matter-repl/Matter_Multi_Fabric_Commissioning.ipynb \
870870
"
871871
872872
- name: Uploading core files

BUILD.gn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
132132
deps = [
133133
"${chip_root}/scripts:matter_yamltests_distribution.wheel",
134134
"${chip_root}/scripts/py_matter_yamltests:matter-yamltests.wheel",
135-
"${chip_root}/src/controller/python:chip-repl",
135+
"${chip_root}/src/controller/python:matter-repl",
136136
"${chip_root}/src/python_testing/matter_testing_infrastructure:matter-testing.wheel",
137137
"${chip_root}/src/python_testing/post_certification_tests:matter-post-certification-tests.wheel",
138138
]
@@ -244,7 +244,7 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
244244
data_deps = [ "${chip_root}/examples/chip-tool" ]
245245

246246
if (chip_enable_python_modules) {
247-
data_deps += [ "${chip_root}/src/controller/python:chip-repl" ]
247+
data_deps += [ "${chip_root}/src/controller/python:matter-repl" ]
248248
}
249249

250250
write_runtime_deps = "${root_out_dir}/certification.runtime_deps"

docs/development_controllers/chip-repl/index.md

Lines changed: 0 additions & 15 deletions
This file was deleted.

docs/development_controllers/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
:maxdepth: 1
66
:hidden:
77
8-
chip-repl/index
98
chip-tool/index
9+
matter-repl/index
1010
```
1111

1212
- [chip-tool](./chip-tool/index.md)
13-
- [chip-repl](./chip-repl/index.md)
13+
- [matter-repl](./matter-repl/index.md)

docs/development_controllers/chip-repl/Matter_Access_Control.ipynb renamed to docs/development_controllers/matter-repl/Matter_Access_Control.ipynb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
"<span style=\"font-weight: bold\"> Replacing </span> store path .<span style=\"color: #800080; text-decoration-color: #800080\">/credentials/development/</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff\">paa-root-certs</span> with \n",
9898
"<span style=\"color: #800080; text-decoration-color: #800080\">/home/root/repos/connectedhomeip/credentials/development/</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff\">paa-root-certs</span>\n",
9999
"Note that you are still running from \n",
100-
"<span style=\"color: #800080; text-decoration-color: #800080\">/home/root/repos/connectedhomeip/docs/development_controllers/</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff\">chip-repl</span> so other relative\n",
100+
"<span style=\"color: #800080; text-decoration-color: #800080\">/home/root/repos/connectedhomeip/docs/development_controllers/</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff\">matter-repl</span> so other relative\n",
101101
"paths may be off.\n",
102102
" \n",
103103
"</pre>\n"
@@ -107,7 +107,7 @@
107107
"\u001b[1m Replacing \u001b[0m store path .\u001b[35m/credentials/development/\u001b[0m\u001b[95mpaa-root-certs\u001b[0m with \n",
108108
"\u001b[35m/home/root/repos/connectedhomeip/credentials/development/\u001b[0m\u001b[95mpaa-root-certs\u001b[0m\n",
109109
"Note that you are still running from \n",
110-
"\u001b[35m/home/root/repos/connectedhomeip/docs/development_controllers/\u001b[0m\u001b[95mchip-repl\u001b[0m so other relative\n",
110+
"\u001b[35m/home/root/repos/connectedhomeip/docs/development_controllers/\u001b[0m\u001b[95mmatter-repl\u001b[0m so other relative\n",
111111
"paths may be off.\n",
112112
" \n"
113113
]
@@ -263,7 +263,7 @@
263263
"source": [
264264
"%reset -f\n",
265265
"import importlib.util\n",
266-
"spec = importlib.util.find_spec('matter.ChipReplStartup')\n",
266+
"spec = importlib.util.find_spec('matter.ReplStartup')\n",
267267
"%run {spec.origin}"
268268
]
269269
},
@@ -360,7 +360,7 @@
360360
"id": "372ae9a4",
361361
"metadata": {},
362362
"source": [
363-
"During Commissioning, an ACL that assigns Administer rights to the commissioner(i.e. chip-repl) was automatically installed on the commissionee."
363+
"During Commissioning, an ACL that assigns Administer rights to the commissioner(i.e. matter-repl) was automatically installed on the commissionee."
364364
]
365365
},
366366
{

docs/development_controllers/chip-repl/Matter_Basic_Interactions.ipynb renamed to docs/development_controllers/matter-repl/Matter_Basic_Interactions.ipynb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"\n",
6868
"Let's first begin by setting up by importing some key modules that are needed to make it easier for us to interact with the Matter stack.\n",
6969
"\n",
70-
"`ChipReplStartup.py` is run within the global namespace. This results in all of its imports being made available here.\n",
70+
"`ReplStartup.py` is run within the global namespace. This results in all of its imports being made available here.\n",
7171
"\n",
7272
"> **NOTE**: _This is not needed if you launch the REPL from the command-line._"
7373
]
@@ -87,7 +87,7 @@
8787
"<span style=\"font-weight: bold\"> Replacing </span> store path .<span style=\"color: #800080; text-decoration-color: #800080\">/credentials/development/</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff\">paa-root-certs</span> with \n",
8888
"<span style=\"color: #800080; text-decoration-color: #800080\">/home/root/repos/connectedhomeip/credentials/development/</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff\">paa-root-certs</span>\n",
8989
"Note that you are still running from \n",
90-
"<span style=\"color: #800080; text-decoration-color: #800080\">/home/root/repos/connectedhomeip/docs/development_controllers/</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff\">chip-repl</span> so other relative\n",
90+
"<span style=\"color: #800080; text-decoration-color: #800080\">/home/root/repos/connectedhomeip/docs/development_controllers/</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff\">matter-repl</span> so other relative\n",
9191
"paths may be off.\n",
9292
" \n",
9393
"</pre>\n"
@@ -97,7 +97,7 @@
9797
"\u001b[1m Replacing \u001b[0m store path .\u001b[35m/credentials/development/\u001b[0m\u001b[95mpaa-root-certs\u001b[0m with \n",
9898
"\u001b[35m/home/root/repos/connectedhomeip/credentials/development/\u001b[0m\u001b[95mpaa-root-certs\u001b[0m\n",
9999
"Note that you are still running from \n",
100-
"\u001b[35m/home/root/repos/connectedhomeip/docs/development_controllers/\u001b[0m\u001b[95mchip-repl\u001b[0m so other relative\n",
100+
"\u001b[35m/home/root/repos/connectedhomeip/docs/development_controllers/\u001b[0m\u001b[95mmatter-repl\u001b[0m so other relative\n",
101101
"paths may be off.\n",
102102
" \n"
103103
]
@@ -253,7 +253,7 @@
253253
"source": [
254254
"%reset -f\n",
255255
"import importlib.util\n",
256-
"spec = importlib.util.find_spec('matter.ChipReplStartup')\n",
256+
"spec = importlib.util.find_spec('matter.ReplStartup')\n",
257257
"%run {spec.origin}"
258258
]
259259
},

docs/development_controllers/chip-repl/Matter_Multi_Fabric_Commissioning.ipynb renamed to docs/development_controllers/matter-repl/Matter_Multi_Fabric_Commissioning.ipynb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"\n",
8686
"Let's first begin setting up by importing some key modules that are needed to make it easier for us to interact with the Matter stack.\n",
8787
"\n",
88-
"`ChipReplStartup.py` is run within the global namespace. This results in all of its imports being made available here.\n",
88+
"`ReplStartup.py` is run within the global namespace. This results in all of its imports being made available here.\n",
8989
"\n",
9090
"> **NOTE**: _This is not needed if you launch the REPL from the command-line._"
9191
]
@@ -106,7 +106,7 @@
106106
"<span style=\"font-weight: bold\"> Replacing </span> store path .<span style=\"color: #800080; text-decoration-color: #800080\">/credentials/development/</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff\">paa-root-certs</span> with \n",
107107
"<span style=\"color: #800080; text-decoration-color: #800080\">/home/root/repos/connectedhomeip/credentials/development/</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff\">paa-root-certs</span>\n",
108108
"Note that you are still running from \n",
109-
"<span style=\"color: #800080; text-decoration-color: #800080\">/home/root/repos/connectedhomeip/docs/development_controllers/</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff\">chip-repl</span> so other relative\n",
109+
"<span style=\"color: #800080; text-decoration-color: #800080\">/home/root/repos/connectedhomeip/docs/development_controllers/</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff\">matter-repl</span> so other relative\n",
110110
"paths may be off.\n",
111111
" \n",
112112
"</pre>\n"
@@ -116,7 +116,7 @@
116116
"\u001b[1m Replacing \u001b[0m store path .\u001b[35m/credentials/development/\u001b[0m\u001b[95mpaa-root-certs\u001b[0m with \n",
117117
"\u001b[35m/home/root/repos/connectedhomeip/credentials/development/\u001b[0m\u001b[95mpaa-root-certs\u001b[0m\n",
118118
"Note that you are still running from \n",
119-
"\u001b[35m/home/root/repos/connectedhomeip/docs/development_controllers/\u001b[0m\u001b[95mchip-repl\u001b[0m so other relative\n",
119+
"\u001b[35m/home/root/repos/connectedhomeip/docs/development_controllers/\u001b[0m\u001b[95mmatter-repl\u001b[0m so other relative\n",
120120
"paths may be off.\n",
121121
" \n"
122122
]
@@ -272,7 +272,7 @@
272272
"source": [
273273
"%reset -f\n",
274274
"import importlib.util\n",
275-
"spec = importlib.util.find_spec('matter.ChipReplStartup')\n",
275+
"spec = importlib.util.find_spec('matter.ReplStartup')\n",
276276
"%run {spec.origin} --debug"
277277
]
278278
},
@@ -798,7 +798,7 @@
798798
"<span style=\"font-weight: bold\"> Replacing </span> store path .<span style=\"color: #800080; text-decoration-color: #800080\">/credentials/development/</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff\">paa-root-certs</span> with \n",
799799
"<span style=\"color: #800080; text-decoration-color: #800080\">/home/root/repos/connectedhomeip/credentials/development/</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff\">paa-root-certs</span>\n",
800800
"Note that you are still running from \n",
801-
"<span style=\"color: #800080; text-decoration-color: #800080\">/home/root/repos/connectedhomeip/docs/development_controllers/</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff\">chip-repl</span> so other relative\n",
801+
"<span style=\"color: #800080; text-decoration-color: #800080\">/home/root/repos/connectedhomeip/docs/development_controllers/</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff\">matter-repl</span> so other relative\n",
802802
"paths may be off.\n",
803803
" \n",
804804
"</pre>\n"
@@ -808,7 +808,7 @@
808808
"\u001b[1m Replacing \u001b[0m store path .\u001b[35m/credentials/development/\u001b[0m\u001b[95mpaa-root-certs\u001b[0m with \n",
809809
"\u001b[35m/home/root/repos/connectedhomeip/credentials/development/\u001b[0m\u001b[95mpaa-root-certs\u001b[0m\n",
810810
"Note that you are still running from \n",
811-
"\u001b[35m/home/root/repos/connectedhomeip/docs/development_controllers/\u001b[0m\u001b[95mchip-repl\u001b[0m so other relative\n",
811+
"\u001b[35m/home/root/repos/connectedhomeip/docs/development_controllers/\u001b[0m\u001b[95mmatter-repl\u001b[0m so other relative\n",
812812
"paths may be off.\n",
813813
" \n"
814814
]
@@ -934,7 +934,7 @@
934934
"source": [
935935
"%reset -f\n",
936936
"import importlib.util\n",
937-
"spec = importlib.util.find_spec('matter.ChipReplStartup')\n",
937+
"spec = importlib.util.find_spec('matter.ReplStartup')\n",
938938
"%run {spec.origin}"
939939
]
940940
},

docs/development_controllers/chip-repl/Matter_REPL_Intro.ipynb renamed to docs/development_controllers/matter-repl/Matter_REPL_Intro.ipynb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"\n",
2727
"Let's first begin by setting up by importing some key modules that are needed to make it easier for us to interact with the Matter stack.\n",
2828
"\n",
29-
"`ChipReplStartup.py` is run within the global namespace. This results in all of its imports being made available here.\n",
29+
"`ReplStartup.py` is run within the global namespace. This results in all of its imports being made available here.\n",
3030
"\n",
3131
"> **NOTE**: _This is not needed if you launch the REPL from the command-line._"
3232
]
@@ -46,7 +46,7 @@
4646
"<span style=\"font-weight: bold\"> Replacing </span> store path .<span style=\"color: #800080; text-decoration-color: #800080\">/credentials/development/</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff\">paa-root-certs</span> with \n",
4747
"<span style=\"color: #800080; text-decoration-color: #800080\">/home/root/repos/connectedhomeip/credentials/development/</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff\">paa-root-certs</span>\n",
4848
"Note that you are still running from \n",
49-
"<span style=\"color: #800080; text-decoration-color: #800080\">/home/root/repos/connectedhomeip/docs/development_controllers/</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff\">chip-repl</span> so other relative\n",
49+
"<span style=\"color: #800080; text-decoration-color: #800080\">/home/root/repos/connectedhomeip/docs/development_controllers/</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff\">matter-repl</span> so other relative\n",
5050
"paths may be off.\n",
5151
" \n",
5252
"</pre>\n"
@@ -56,7 +56,7 @@
5656
"\u001b[1m Replacing \u001b[0m store path .\u001b[35m/credentials/development/\u001b[0m\u001b[95mpaa-root-certs\u001b[0m with \n",
5757
"\u001b[35m/home/root/repos/connectedhomeip/credentials/development/\u001b[0m\u001b[95mpaa-root-certs\u001b[0m\n",
5858
"Note that you are still running from \n",
59-
"\u001b[35m/home/root/repos/connectedhomeip/docs/development_controllers/\u001b[0m\u001b[95mchip-repl\u001b[0m so other relative\n",
59+
"\u001b[35m/home/root/repos/connectedhomeip/docs/development_controllers/\u001b[0m\u001b[95mmatter-repl\u001b[0m so other relative\n",
6060
"paths may be off.\n",
6161
" \n"
6262
]
@@ -195,7 +195,7 @@
195195
"source": [
196196
"%reset -f\n",
197197
"import importlib.util\n",
198-
"spec = importlib.util.find_spec('matter.ChipReplStartup')\n",
198+
"spec = importlib.util.find_spec('matter.ReplStartup')\n",
199199
"%run {spec.origin}"
200200
]
201201
},
@@ -222,7 +222,7 @@
222222
"<span style=\"font-weight: bold\"> Replacing </span> store path .<span style=\"color: #800080; text-decoration-color: #800080\">/credentials/development/</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff\">paa-root-certs</span> with \n",
223223
"<span style=\"color: #800080; text-decoration-color: #800080\">/home/root/repos/connectedhomeip/credentials/development/</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff\">paa-root-certs</span>\n",
224224
"Note that you are still running from \n",
225-
"<span style=\"color: #800080; text-decoration-color: #800080\">/home/root/repos/connectedhomeip/docs/development_controllers/</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff\">chip-repl</span> so other relative\n",
225+
"<span style=\"color: #800080; text-decoration-color: #800080\">/home/root/repos/connectedhomeip/docs/development_controllers/</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff\">matter-repl</span> so other relative\n",
226226
"paths may be off.\n",
227227
" \n",
228228
"</pre>\n"
@@ -232,7 +232,7 @@
232232
"\u001b[1m Replacing \u001b[0m store path .\u001b[35m/credentials/development/\u001b[0m\u001b[95mpaa-root-certs\u001b[0m with \n",
233233
"\u001b[35m/home/root/repos/connectedhomeip/credentials/development/\u001b[0m\u001b[95mpaa-root-certs\u001b[0m\n",
234234
"Note that you are still running from \n",
235-
"\u001b[35m/home/root/repos/connectedhomeip/docs/development_controllers/\u001b[0m\u001b[95mchip-repl\u001b[0m so other relative\n",
235+
"\u001b[35m/home/root/repos/connectedhomeip/docs/development_controllers/\u001b[0m\u001b[95mmatter-repl\u001b[0m so other relative\n",
236236
"paths may be off.\n",
237237
" \n"
238238
]
@@ -358,7 +358,7 @@
358358
"source": [
359359
"%reset -f\n",
360360
"import importlib.util\n",
361-
"spec = importlib.util.find_spec('matter.ChipReplStartup')\n",
361+
"spec = importlib.util.find_spec('matter.ReplStartup')\n",
362362
"%run {spec.origin} --storage-path /tmp/repl.json"
363363
]
364364
},
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# matter-repl
2+
3+
```{toctree}
4+
:glob:
5+
:maxdepth: 1
6+
:hidden:
7+
8+
*
9+
```
10+
11+
- [Matter REPL](./matter-repl.md)
12+
- [Intro](https://github.com/project-chip/connectedhomeip/blob/master/docs/development_controllers/matter-repl/Matter_REPL_Intro.ipynb)
13+
- [Basic interactions](https://github.com/project-chip/connectedhomeip/blob/master/docs/development_controllers/matter-repl/Matter_Basic_Interactions.ipynb)
14+
- [Access Control](https://github.com/project-chip/connectedhomeip/blob/master/docs/development_controllers/matter-repl/Matter_Access_Control.ipynb)
15+
- [Multi Fabric Commissioning](https://github.com/project-chip/connectedhomeip/blob/master/docs/development_controllers/matter-repl/Matter_Multi_Fabric_Commissioning.ipynb)

0 commit comments

Comments
 (0)