From d648edbe0f45a0f93e70d5c4780862bc66769140 Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan@agner.ch>
Date: Tue, 23 May 2023 10:50:24 +0200
Subject: [PATCH 1/2] [python] make enum part of cluster wheel

The new enum type is required in the Cluster objects. Make it and its
dependency part of the Cluster CHIP wheel.

Fixes PR #24352.
---
 src/controller/python/BUILD.gn | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/controller/python/BUILD.gn b/src/controller/python/BUILD.gn
index 3f9e310e44e1ee..4512127a8d8d7b 100644
--- a/src/controller/python/BUILD.gn
+++ b/src/controller/python/BUILD.gn
@@ -214,7 +214,6 @@ chip_python_wheel_action("chip-core") {
         "chip/clusters/Attribute.py",
         "chip/clusters/Command.py",
         "chip/clusters/__init__.py",
-        "chip/clusters/enum.py",
         "chip/commissioning/__init__.py",
         "chip/commissioning/commissioning_flow_blocks.py",
         "chip/commissioning/pase.py",
@@ -300,7 +299,6 @@ chip_python_wheel_action("chip-core") {
   }
 
   py_package_reqs = [
-    "aenum",
     "coloredlogs",
     "construct",
     "dacite",
@@ -358,6 +356,7 @@ chip_python_wheel_action("chip-clusters") {
         "chip/ChipUtility.py",
         "chip/clusters/CHIPClusters.py",
         "chip/clusters/ClusterObjects.py",
+        "chip/clusters/enum.py",
         "chip/clusters/Objects.py",
         "chip/clusters/TestObjects.py",
         "chip/clusters/Types.py",
@@ -378,7 +377,10 @@ chip_python_wheel_action("chip-clusters") {
     "chip.tlv",
   ]
 
-  py_package_reqs = [ "dacite" ]
+  py_package_reqs = [
+    "dacite",
+    "aenum",
+  ]
 
   py_package_name = "${chip_python_package_prefix}-clusters"
   py_package_output = string_replace(py_package_name, "-", "_")

From 26498ec8ac9215b4b0bc441d3cac4831f69cc4b8 Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan@agner.ch>
Date: Wed, 24 May 2023 08:20:02 +0200
Subject: [PATCH 2/2] Restyle

---
 src/controller/python/BUILD.gn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controller/python/BUILD.gn b/src/controller/python/BUILD.gn
index 4512127a8d8d7b..102e9f3f654ace 100644
--- a/src/controller/python/BUILD.gn
+++ b/src/controller/python/BUILD.gn
@@ -356,10 +356,10 @@ chip_python_wheel_action("chip-clusters") {
         "chip/ChipUtility.py",
         "chip/clusters/CHIPClusters.py",
         "chip/clusters/ClusterObjects.py",
-        "chip/clusters/enum.py",
         "chip/clusters/Objects.py",
         "chip/clusters/TestObjects.py",
         "chip/clusters/Types.py",
+        "chip/clusters/enum.py",
         "chip/tlv/__init__.py",
       ]
     },