Python 3.10 / Base image 2022.06.01 (#73830)

* Python 3.10 / Base image 2022.06.01 * Update requirements * push opencv * we don't need numpy on core for now * Remove unused ignore Co-authored-by: Franck Nijhof <git@frenck.dev>
2025-06-25 01:21:51 +02:00 · 2022-06-22 19:04:39 +02:00
parent 6b6e5fad3c
commit 6cf9b22b5a
19 changed files with 43 additions and 162 deletions
--- a/machine/khadas-vim3
+++ b/machine/khadas-vim3
@ -2,4 +2,9 @@ ARG BUILD_VERSION
 FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION

 RUN apk --no-cache add \
-    usbutils
+    usbutils \
+    && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
+        pybluez \
+        pygatt[GATTTOOL] \
+        -c /usr/src/homeassistant/requirements_all.txt \
+        --use-deprecated=legacy-resolver
--- a/machine/raspberrypi3
+++ b/machine/raspberrypi3
@ -6,7 +6,9 @@ RUN apk --no-cache add \
        raspberrypi-libs \
        usbutils \
    && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
-        bluepy pybluez -c /usr/src/homeassistant/requirements_all.txt \
+        pybluez \
+        pygatt[GATTTOOL] \
+        -c /usr/src/homeassistant/requirements_all.txt \
        --use-deprecated=legacy-resolver

 ##
--- a/machine/raspberrypi3-64
+++ b/machine/raspberrypi3-64
@ -6,7 +6,9 @@ RUN apk --no-cache add \
        raspberrypi-libs \
        usbutils \
    && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
-        bluepy pybluez -c /usr/src/homeassistant/requirements_all.txt \
+        pybluez \
+        pygatt[GATTTOOL] \
+        -c /usr/src/homeassistant/requirements_all.txt \
        --use-deprecated=legacy-resolver

 ##
--- a/machine/raspberrypi4
+++ b/machine/raspberrypi4
@ -6,7 +6,9 @@ RUN apk --no-cache add \
        raspberrypi-libs \
        usbutils \
    && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
-        bluepy pybluez -c /usr/src/homeassistant/requirements_all.txt \
+        pybluez \
+        pygatt[GATTTOOL] \
+        -c /usr/src/homeassistant/requirements_all.txt \
        --use-deprecated=legacy-resolver

 ##
--- a/machine/raspberrypi4-64
+++ b/machine/raspberrypi4-64
@ -6,7 +6,9 @@ RUN apk --no-cache add \
        raspberrypi-libs \
        usbutils \
    && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
-        bluepy pybluez -c /usr/src/homeassistant/requirements_all.txt \
+        pybluez \
+        pygatt[GATTTOOL] \
+        -c /usr/src/homeassistant/requirements_all.txt \
        --use-deprecated=legacy-resolver

 ##
--- a/machine/tinker
+++ b/machine/tinker
@ -3,8 +3,7 @@ FROM homeassistant/armv7-homeassistant:$BUILD_VERSION

 RUN apk --no-cache add usbutils \
    && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
-        -c /usr/src/homeassistant/homeassistant/package_constraints.txt \
-        --use-deprecated=legacy-resolver \
-        bluepy \
        pybluez \
-        pygatt[GATTTOOL]
+        pygatt[GATTTOOL] \
+        -c /usr/src/homeassistant/requirements_all.txt \
+        --use-deprecated=legacy-resolver