From 5835c518137eb3712c0d924a619102e02cc2453e Mon Sep 17 00:00:00 2001 From: yunhanw Date: Wed, 9 Nov 2022 14:04:23 -0800 Subject: [PATCH 1/2] remove unused python-dbus --- scripts/constraints.txt | 4 +--- scripts/requirements.txt | 3 +-- src/controller/python/BUILD.gn | 1 - src/pybindings/pycontroller/build-chip-wheel.py | 1 - 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/scripts/constraints.txt b/scripts/constraints.txt index de47efb650bebd..76b66c43ced8ce 100644 --- a/scripts/constraints.txt +++ b/scripts/constraints.txt @@ -61,9 +61,7 @@ cryptography==3.4.7 # via # -c constraints.esp32.txt # -r requirements.txt -cxxfilt==0.2.2 - # via -r requirements.txt -dbus-python==1.2.18 ; sys_platform == "linux" +cxxfilt==0.2.2 ; sys_platform == "linux" # via -r requirements.txt decorator==5.0.9 # via ipython diff --git a/scripts/requirements.txt b/scripts/requirements.txt index 7a1068059111ae..c08e4d5ddb6d0c 100644 --- a/scripts/requirements.txt +++ b/scripts/requirements.txt @@ -21,8 +21,7 @@ virtualenv requests>=2.24.0 # device controller wheel package -wheel -dbus-python==1.2.18; sys_platform == 'linux' +wheel; sys_platform == 'linux' pgi; sys_platform == 'linux' pyobjc-core; sys_platform == 'darwin' pyobjc-framework-cocoa; sys_platform == 'darwin' diff --git a/src/controller/python/BUILD.gn b/src/controller/python/BUILD.gn index 7031bdf08aa361..ef181bcd72bc09 100644 --- a/src/controller/python/BUILD.gn +++ b/src/controller/python/BUILD.gn @@ -299,7 +299,6 @@ chip_python_wheel_action("chip-core") { py_package_reqs += [ "pyobjc-framework-corebluetooth" ] } else if (current_os == "linux") { py_package_reqs += [ - "dbus-python==1.2.18", "pygobject", ] } diff --git a/src/pybindings/pycontroller/build-chip-wheel.py b/src/pybindings/pycontroller/build-chip-wheel.py index 2bc04f43c8b23d..d1de5922443b2b 100644 --- a/src/pybindings/pycontroller/build-chip-wheel.py +++ b/src/pybindings/pycontroller/build-chip-wheel.py @@ -123,7 +123,6 @@ def finalize_options(self): requiredPackages.append('pyobjc-framework-corebluetooth') if platform.system() == 'Linux': - requiredPackages.append('dbus-python==1.2.18') requiredPackages.append('pygobject') # From 98899b346927b0d9aefce23133de05b352550188 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Wed, 9 Nov 2022 22:06:09 +0000 Subject: [PATCH 2/2] Restyled by gn --- src/controller/python/BUILD.gn | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/controller/python/BUILD.gn b/src/controller/python/BUILD.gn index ef181bcd72bc09..e39ef1824b9a20 100644 --- a/src/controller/python/BUILD.gn +++ b/src/controller/python/BUILD.gn @@ -298,9 +298,7 @@ chip_python_wheel_action("chip-core") { if (current_os == "mac") { py_package_reqs += [ "pyobjc-framework-corebluetooth" ] } else if (current_os == "linux") { - py_package_reqs += [ - "pygobject", - ] + py_package_reqs += [ "pygobject" ] } if (current_cpu == "x64") {