Skip to content

Commit

Permalink
Pin dbus-python to correct version (#22624)
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
tcarmelveilleux authored Sep 14, 2022
1 parent 8c4675f commit f4f81f2
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion scripts/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ cryptography==3.4.7
# -r requirements.txt
cxxfilt==0.2.2
# via -r requirements.txt
dbus-python==1.2.16 ; sys_platform == "linux"
dbus-python==1.2.18 ; sys_platform == "linux"
# via -r requirements.txt
decorator==5.0.9
# via ipython
Expand Down
4 changes: 2 additions & 2 deletions scripts/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ requests>=2.24.0

# device controller wheel package
wheel
dbus-python; sys_platform == 'linux'
dbus-python==1.2.18; sys_platform == 'linux'
pgi; sys_platform == 'linux'
pyobjc-core; sys_platform == 'darwin'
pyobjc-framework-cocoa; sys_platform == 'darwin'
Expand Down Expand Up @@ -65,4 +65,4 @@ cryptography
colorama

# update tornado for pw_watch
tornado
tornado
2 changes: 1 addition & 1 deletion src/controller/python/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ chip_python_wheel_action("chip-core") {
py_package_reqs += [ "pyobjc-framework-corebluetooth" ]
} else if (current_os == "linux") {
py_package_reqs += [
"dbus-python",
"dbus-python==1.2.18",
"pygobject",
]
}
Expand Down
2 changes: 1 addition & 1 deletion src/pybindings/pycontroller/build-chip-wheel.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def finalize_options(self):
requiredPackages.append('pyobjc-framework-corebluetooth')

if platform.system() == 'Linux':
requiredPackages.append('dbus-python')
requiredPackages.append('dbus-python==1.2.18')
requiredPackages.append('pygobject')

#
Expand Down

0 comments on commit f4f81f2

Please sign in to comment.