Skip to content

Commit f4f81f2

Browse files
Pin dbus-python to correct version (#22624)
- dbus-python was updated on Sep 6 2022 to 1.3.0. - This change caused issues with arm64 build of python controller This PR changes pinned version 1.2.18, the version most tested by Python scripts up to now (used to be the default highest). Fixes #22613 Testing done: - Built successfully with prior version known to work - Can run tests
1 parent 8c4675f commit f4f81f2

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

scripts/constraints.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ cryptography==3.4.7
6363
# -r requirements.txt
6464
cxxfilt==0.2.2
6565
# via -r requirements.txt
66-
dbus-python==1.2.16 ; sys_platform == "linux"
66+
dbus-python==1.2.18 ; sys_platform == "linux"
6767
# via -r requirements.txt
6868
decorator==5.0.9
6969
# via ipython

scripts/requirements.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ requests>=2.24.0
1616

1717
# device controller wheel package
1818
wheel
19-
dbus-python; sys_platform == 'linux'
19+
dbus-python==1.2.18; sys_platform == 'linux'
2020
pgi; sys_platform == 'linux'
2121
pyobjc-core; sys_platform == 'darwin'
2222
pyobjc-framework-cocoa; sys_platform == 'darwin'
@@ -65,4 +65,4 @@ cryptography
6565
colorama
6666

6767
# update tornado for pw_watch
68-
tornado
68+
tornado

src/controller/python/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ chip_python_wheel_action("chip-core") {
298298
py_package_reqs += [ "pyobjc-framework-corebluetooth" ]
299299
} else if (current_os == "linux") {
300300
py_package_reqs += [
301-
"dbus-python",
301+
"dbus-python==1.2.18",
302302
"pygobject",
303303
]
304304
}

src/pybindings/pycontroller/build-chip-wheel.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ def finalize_options(self):
123123
requiredPackages.append('pyobjc-framework-corebluetooth')
124124

125125
if platform.system() == 'Linux':
126-
requiredPackages.append('dbus-python')
126+
requiredPackages.append('dbus-python==1.2.18')
127127
requiredPackages.append('pygobject')
128128

129129
#

0 commit comments

Comments
 (0)