Skip to content

Commit cd70e9d

Browse files
rquidutegemini-code-assist[bot]antonio-amjr
authored
Updated fetch_sdk_tests_and_runner script to install chipyaml wheel (#260)
* Updated fetch_sdk_tests_and_runner script to install chipyaml wheel * updated cspell.json file * Update test_collections/matter/sdk_tests/scripts/fetch_sdk_tests_and_runner.sh Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> * Code review - gemini * Update test_collections/matter/sdk_tests/scripts/fetch_sdk_tests_and_runner.sh Co-authored-by: antonio-amjr <116589331+antonio-amjr@users.noreply.github.com> --------- Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Co-authored-by: antonio-amjr <116589331+antonio-amjr@users.noreply.github.com>
1 parent 8798d5a commit cd70e9d

2 files changed

Lines changed: 33 additions & 22 deletions

File tree

cspell.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@
109109
"PCSC",
110110
"pcscd",
111111
"DGRAM",
112-
"chipyaml"
112+
"chipyaml",
113+
"webrtc"
113114
],
114115
"allowCompoundWords": true,
115116
"ignorePaths": [

test_collections/matter/sdk_tests/scripts/fetch_sdk_tests_and_runner.sh

Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ SDK_YAML_PATH="src/app/tests/suites/certification"
3232
SDK_PYTHON_SCRIPT_PATH="src/python_testing"
3333
SDK_PYTHON_DATA_MODEL_PATH="data_model"
3434
SDK_SCRIPTS_PATH="scripts/"
35-
SDK_EXAMPLE_CHIP_TOOL_PATH="examples/chip-tool"
36-
SDK_EXAMPLE_PLACEHOLDER_PATH="examples/placeholder"
35+
SDK_ADAPTER_PATH="scripts/tests/chipyaml"
3736
SDK_DATA_MODEL_PATH="src/app/zap-templates/zcl/data-model/chip"
3837

3938
TEST_COLLECTIONS_SDK_CHECKOUT_PATH="$MATTER_PROGRAM_DIR/sdk_tests/sdk_checkout"
@@ -102,7 +101,7 @@ then
102101
git clone --filter=blob:none --no-checkout --depth 1 --sparse https://github.com/project-chip/connectedhomeip.git $TMP_SDK_FOLDER
103102
cd $TMP_SDK_FOLDER
104103
git sparse-checkout init
105-
git sparse-checkout set $SDK_YAML_PATH $SDK_SCRIPTS_PATH $SDK_EXAMPLE_PLACEHOLDER_PATH $SDK_EXAMPLE_CHIP_TOOL_PATH $SDK_DATA_MODEL_PATH $SDK_PYTHON_SCRIPT_PATH $SDK_PYTHON_DATA_MODEL_PATH
104+
git sparse-checkout set $SDK_YAML_PATH $SDK_SCRIPTS_PATH $SDK_ADAPTER_PATH $SDK_DATA_MODEL_PATH $SDK_PYTHON_SCRIPT_PATH $SDK_PYTHON_DATA_MODEL_PATH
106105
git checkout -q $SDK_SHA
107106
SDK_PATH="$TMP_SDK_PATH"
108107
fi
@@ -159,28 +158,39 @@ rm -rf ${EXTRACTION_ROOT}
159158

160159
mkdir -p ${EXTRACTION_ROOT}
161160

162-
cd ${SDK_PATH}/scripts/py_matter_idl
163-
python -m build --outdir ${EXTRACTION_ROOT}
164-
cd ${SDK_PATH}/scripts/py_matter_yamltests
165-
python -m build --outdir ${EXTRACTION_ROOT}
166-
# Copy the chipyaml adapters and install as editable package
167-
cp -r ${SDK_PATH}/scripts/tests/chipyaml ${EXTRACTION_ROOT}/chipyaml
168-
169-
# Create a simple setup.py for chipyaml in the extraction root
170-
cat > ${EXTRACTION_ROOT}/setup.py << 'EOF'
171-
from setuptools import setup, find_packages
172-
setup(
173-
name='chipyaml',
174-
version='1.0.0',
175-
packages=find_packages(),
176-
install_requires=[]
177-
)
161+
162+
python -m build --outdir "${EXTRACTION_ROOT}" "${SDK_PATH}/scripts/py_matter_idl"
163+
python -m build --outdir "${EXTRACTION_ROOT}" "${SDK_PATH}/scripts/py_matter_yamltests"
164+
# Create chipyaml package with the full adapters structure
165+
mkdir -p "${EXTRACTION_ROOT}/chipyaml_src"
166+
cp -r ${SDK_PATH}/scripts/tests/chipyaml ${EXTRACTION_ROOT}/chipyaml_src/
167+
168+
# Create pyproject.toml for chipyaml package at the root level
169+
cat > ${EXTRACTION_ROOT}/chipyaml_src/pyproject.toml << 'EOF'
170+
[build-system]
171+
requires = ['setuptools>=45', 'wheel']
172+
build-backend = 'setuptools.build_meta'
173+
174+
[project]
175+
name = "chipyaml"
176+
version = "0.1.0"
177+
authors = [{name = "Project CHIP Authors"}]
178+
description = "Matter chipyaml package with adapters"
179+
180+
[tool.setuptools.packages.find]
181+
where = ["."]
178182
EOF
179183

180-
# Install chipyaml as editable package
184+
# Build chipyaml package from the source root
185+
python -m build --outdir "${EXTRACTION_ROOT}" "${EXTRACTION_ROOT}/chipyaml_src"
186+
187+
# Clean up temporary source directory
188+
rm -rf ${EXTRACTION_ROOT}/chipyaml_src
189+
190+
# Change to a safe directory before installing wheels
181191
cd ${EXTRACTION_ROOT}
182-
pip install -e .
183192

193+
echo "install_matter_wheels"
184194
install_matter_wheels
185195

186196
# The runner needs some cluster definitions to used when parsing the YAML test. It allows to properly translate YAML

0 commit comments

Comments
 (0)