Skip to content

Commit 118249e

Browse files
authored
Merge pull request #5 from home-assistant-libs/drop-pygobject-dependency
Drop pygobject dependency
2 parents 0c00070 + b3af26b commit 118249e

5 files changed

+54
-10
lines changed

.github/workflows/build.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ jobs:
8989
patch -p1 < ../0001-Support-custom-platform-tag.patch
9090
patch -p1 < ../0002-Revert-Python-dependencies.patch
9191
patch -p1 < ../0003-Use-data-as-platform-storage-location.patch
92+
patch -p1 < ../0004-Drop-pygobject-dependency.patch
9293
- name: Bootstrap
9394
run: scripts/build/gn_bootstrap.sh
9495
- name: Setup Build, Run Build and Run Tests

0001-Support-custom-platform-tag.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
From 60ee727300ce3685624cbece545f81d3c6350a8b Mon Sep 17 00:00:00 2001
2-
Message-Id: <60ee727300ce3685624cbece545f81d3c6350a8b.1673964289.git.stefan@agner.ch>
2+
Message-Id: <60ee727300ce3685624cbece545f81d3c6350a8b.1676381983.git.stefan@agner.ch>
33
From: Stefan Agner <stefan@agner.ch>
44
Date: Tue, 22 Nov 2022 10:51:17 +0100
55
Subject: [PATCH] Support custom platform tag
@@ -47,5 +47,5 @@ index a0381f096..8da839169 100644
4747
tags = "cp37-abi3-" + py_platform_tag
4848

4949
--
50-
2.39.0
50+
2.39.1
5151

0002-Revert-Python-dependencies.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 476de3f0ff61b91d2547269ee62bc8c2a76a7441 Mon Sep 17 00:00:00 2001
2-
Message-Id: <476de3f0ff61b91d2547269ee62bc8c2a76a7441.1673964289.git.stefan@agner.ch>
3-
In-Reply-To: <60ee727300ce3685624cbece545f81d3c6350a8b.1673964289.git.stefan@agner.ch>
4-
References: <60ee727300ce3685624cbece545f81d3c6350a8b.1673964289.git.stefan@agner.ch>
2+
Message-Id: <476de3f0ff61b91d2547269ee62bc8c2a76a7441.1676381983.git.stefan@agner.ch>
3+
In-Reply-To: <60ee727300ce3685624cbece545f81d3c6350a8b.1676381983.git.stefan@agner.ch>
4+
References: <60ee727300ce3685624cbece545f81d3c6350a8b.1676381983.git.stefan@agner.ch>
55
From: Stefan Agner <stefan@agner.ch>
66
Date: Mon, 19 Sep 2022 23:05:51 +0200
77
Subject: [PATCH] Revert Python dependencies
@@ -28,5 +28,5 @@ index 8da839169..8c913d1f9 100644
2828

2929
if (current_os == "mac") {
3030
--
31-
2.39.0
31+
2.39.1
3232

0003-Use-data-as-platform-storage-location.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 74754ce606449449286a86227ab2161befe09a06 Mon Sep 17 00:00:00 2001
2-
Message-Id: <74754ce606449449286a86227ab2161befe09a06.1673964289.git.stefan@agner.ch>
3-
In-Reply-To: <60ee727300ce3685624cbece545f81d3c6350a8b.1673964289.git.stefan@agner.ch>
4-
References: <60ee727300ce3685624cbece545f81d3c6350a8b.1673964289.git.stefan@agner.ch>
2+
Message-Id: <74754ce606449449286a86227ab2161befe09a06.1676381983.git.stefan@agner.ch>
3+
In-Reply-To: <60ee727300ce3685624cbece545f81d3c6350a8b.1676381983.git.stefan@agner.ch>
4+
References: <60ee727300ce3685624cbece545f81d3c6350a8b.1676381983.git.stefan@agner.ch>
55
From: Stefan Agner <stefan@agner.ch>
66
Date: Fri, 27 May 2022 16:38:14 +0200
77
Subject: [PATCH] Use /data as platform storage location
@@ -28,5 +28,5 @@ index 69d028925..af1019350 100644
2828
"../DeviceSafeQueue.cpp",
2929
"../DeviceSafeQueue.h",
3030
--
31-
2.39.0
31+
2.39.1
3232

0004-Drop-pygobject-dependency.patch

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
From 6aa8bceb2fbe34e746c9cf78b9857ab1434236f1 Mon Sep 17 00:00:00 2001
2+
Message-Id: <6aa8bceb2fbe34e746c9cf78b9857ab1434236f1.1676381983.git.stefan@agner.ch>
3+
In-Reply-To: <60ee727300ce3685624cbece545f81d3c6350a8b.1676381983.git.stefan@agner.ch>
4+
References: <60ee727300ce3685624cbece545f81d3c6350a8b.1676381983.git.stefan@agner.ch>
5+
From: Stefan Agner <stefan@agner.ch>
6+
Date: Tue, 14 Feb 2023 14:37:54 +0100
7+
Subject: [PATCH] Drop pygobject dependency
8+
9+
---
10+
src/controller/python/BUILD.gn | 2 --
11+
src/pybindings/pycontroller/build-chip-wheel.py | 3 ---
12+
2 files changed, 5 deletions(-)
13+
14+
diff --git a/src/controller/python/BUILD.gn b/src/controller/python/BUILD.gn
15+
index 8c913d1f9..8f0a40a1f 100644
16+
--- a/src/controller/python/BUILD.gn
17+
+++ b/src/controller/python/BUILD.gn
18+
@@ -312,8 +312,6 @@ chip_python_wheel_action("chip-core") {
19+
20+
if (current_os == "mac") {
21+
py_package_reqs += [ "pyobjc-framework-corebluetooth" ]
22+
- } else if (current_os == "linux") {
23+
- py_package_reqs += [ "pygobject" ]
24+
}
25+
26+
if (current_cpu == "x64") {
27+
diff --git a/src/pybindings/pycontroller/build-chip-wheel.py b/src/pybindings/pycontroller/build-chip-wheel.py
28+
index d1de59224..8d913b43d 100644
29+
--- a/src/pybindings/pycontroller/build-chip-wheel.py
30+
+++ b/src/pybindings/pycontroller/build-chip-wheel.py
31+
@@ -122,9 +122,6 @@ try:
32+
if platform.system() == 'Darwin':
33+
requiredPackages.append('pyobjc-framework-corebluetooth')
34+
35+
- if platform.system() == 'Linux':
36+
- requiredPackages.append('pygobject')
37+
-
38+
#
39+
# Build the chip package...
40+
#
41+
--
42+
2.39.1
43+

0 commit comments

Comments
 (0)