From 350dc6ae8b011b1e29070797daa55100840b3fbf Mon Sep 17 00:00:00 2001
From: WanqQixiang <wangqixiang@espressif.com>
Date: Tue, 3 Jan 2023 19:04:34 +0800
Subject: [PATCH] scripts: Install the requirements for Matter

---
 .gitlab-ci.yml   | 11 ++---------
 export.sh        |  6 +++---
 install.sh       | 10 ++++++++++
 requirements.txt |  5 +++++
 4 files changed, 20 insertions(+), 12 deletions(-)
 create mode 100644 requirements.txt

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 51ea9ad7c..8a249d764 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -71,10 +71,6 @@ variables:
   - ./install.sh
   - . ./export.sh
 
-.activate_matter_build_env: &activate_matter_build_env
-  - cd ${CI_PROJECT_DIR}
-  - source ./connectedhomeip/connectedhomeip/scripts/activate.sh
-
 .build_matter_examples: &build_matter_examples
     - export MATTER_EXAMPLES_PATH=$ESP_MATTER_PATH/connectedhomeip/connectedhomeip/examples
     - cd $MATTER_EXAMPLES_PATH/all-clusters-app/esp32
@@ -122,8 +118,6 @@ variables:
     - cp sdkconfig.defaults.backup sdkconfig.defaults
 
 .build_examples_idf_v5_0: &build_examples_idf_v5_0
-    # Need to install esptool 4.4 and pyparsing 3.0.9 in matter build env for IDF v5.0
-    - python3 -m pip install esptool==4.4 pyparsing==3.0.9
     - cd $ESP_MATTER_PATH/examples/zap_light
     - idf.py --preview set-target esp32h2
     - idf.py build
@@ -149,15 +143,14 @@ variables:
     - *add_gitlab_ssh_key
     - *get_build_caches
     - *chip_submodule_update
-    - *setup_matter
     - *setup_idf
-    - *activate_matter_build_env
+    - *setup_matter
     - cd ${ESP_MATTER_PATH}
     - mkdir -p ${REPOS_PATH}
     # update caches only when setup succeed
     - *update_build_caches
   variables:
-    IDF_VERSION: "v4.4.2"
+    IDF_VERSION: "v4.4.3"
     REPOS_PATH: "$CI_PROJECT_DIR/repos"
     IDF_CCACHE_ENABLE: 1
 
diff --git a/export.sh b/export.sh
index 1c2c99e09..d5c4f26d1 100644
--- a/export.sh
+++ b/export.sh
@@ -45,10 +45,10 @@ esp_matter_export_main() {
         fi
         export ESP_MATTER_PATH="${script_dir}"
         echo "Setting ESP_MATTER_PATH to '${ESP_MATTER_PATH}'"
-     fi
+    fi
 
-     # PATH for gn
-     export PATH=${PATH}:${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip/.environment/cipd/packages/pigweed/
+    # PATH for gn
+    export PATH=${PATH}:${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip/.environment/cipd/packages/pigweed/
 
     # PATH for host tools
     export PATH=${PATH}:${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip/out/host
diff --git a/install.sh b/install.sh
index ce747362d..356ce810f 100755
--- a/install.sh
+++ b/install.sh
@@ -21,11 +21,21 @@ echo ""
 echo "Host tools built at: ${MATTER_PATH}/out/host"
 echo ""
 
+echo ""
+echo "Exit Matter environment"
+echo ""
+deactivate
+
 echo ""
 echo "Installing python dependencies for mfg_tool"
 echo ""
 python3 -m pip install -r ${ESP_MATTER_PATH}/tools/mfg_tool/requirements.txt
 
+echo ""
+echo "Installing python dependencies for Matter"
+echo ""
+python3 -m pip install -r ${ESP_MATTER_PATH}/requirements.txt
+
 echo "All done! You can now run:"
 echo ""
 echo "  . ${basedir}/export.sh"
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 000000000..766e1c3f1
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,5 @@
+# matter idl
+lark==1.1.2
+stringcase==1.2.0
+# jinja2 is removed in IDF v5.0 environment, but it is required for matter building
+jinja2==3.0.1