From 1bc82e2f857b92d3c98de84aedd320a89f3e07ce Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 8 Feb 2022 19:18:04 +0100 Subject: [PATCH] Use legacy pip resolver in machine builds (#66094) --- machine/raspberrypi | 3 ++- machine/raspberrypi2 | 3 ++- machine/raspberrypi3 | 3 ++- machine/raspberrypi3-64 | 3 ++- machine/raspberrypi4 | 3 ++- machine/raspberrypi4-64 | 3 ++- machine/tinker | 1 + 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/machine/raspberrypi b/machine/raspberrypi index 3f000b14db7..960e343792d 100644 --- a/machine/raspberrypi +++ b/machine/raspberrypi @@ -7,7 +7,8 @@ RUN apk --no-cache add \ usbutils \ && sed -i "s|# RPi.GPIO|RPi.GPIO|g" /usr/src/homeassistant/requirements_all.txt \ && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \ - RPi.GPIO -c /usr/src/homeassistant/requirements_all.txt + RPi.GPIO -c /usr/src/homeassistant/requirements_all.txt \ + --use-deprecated=legacy-resolver ## # Set symlinks for raspberry pi camera binaries. diff --git a/machine/raspberrypi2 b/machine/raspberrypi2 index 484b209b6fa..225c45423a1 100644 --- a/machine/raspberrypi2 +++ b/machine/raspberrypi2 @@ -7,7 +7,8 @@ RUN apk --no-cache add \ usbutils \ && sed -i "s|# RPi.GPIO|RPi.GPIO|g" /usr/src/homeassistant/requirements_all.txt \ && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \ - RPi.GPIO -c /usr/src/homeassistant/requirements_all.txt + RPi.GPIO -c /usr/src/homeassistant/requirements_all.txt \ + --use-deprecated=legacy-resolver ## # Set symlinks for raspberry pi binaries. diff --git a/machine/raspberrypi3 b/machine/raspberrypi3 index 1aec7ebf39f..6315cc3e885 100644 --- a/machine/raspberrypi3 +++ b/machine/raspberrypi3 @@ -7,7 +7,8 @@ RUN apk --no-cache add \ usbutils \ && sed -i "s|# RPi.GPIO|RPi.GPIO|g" /usr/src/homeassistant/requirements_all.txt \ && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \ - RPi.GPIO bluepy pybluez -c /usr/src/homeassistant/requirements_all.txt + RPi.GPIO bluepy pybluez -c /usr/src/homeassistant/requirements_all.txt \ + --use-deprecated=legacy-resolver ## # Set symlinks for raspberry pi binaries. diff --git a/machine/raspberrypi3-64 b/machine/raspberrypi3-64 index 165dc2e5397..51f41d68320 100644 --- a/machine/raspberrypi3-64 +++ b/machine/raspberrypi3-64 @@ -7,7 +7,8 @@ RUN apk --no-cache add \ usbutils \ && sed -i "s|# RPi.GPIO|RPi.GPIO|g" /usr/src/homeassistant/requirements_all.txt \ && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \ - RPi.GPIO bluepy pybluez -c /usr/src/homeassistant/requirements_all.txt + RPi.GPIO bluepy pybluez -c /usr/src/homeassistant/requirements_all.txt \ + --use-deprecated=legacy-resolver ## # Set symlinks for raspberry pi binaries. diff --git a/machine/raspberrypi4 b/machine/raspberrypi4 index 1aec7ebf39f..6315cc3e885 100644 --- a/machine/raspberrypi4 +++ b/machine/raspberrypi4 @@ -7,7 +7,8 @@ RUN apk --no-cache add \ usbutils \ && sed -i "s|# RPi.GPIO|RPi.GPIO|g" /usr/src/homeassistant/requirements_all.txt \ && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \ - RPi.GPIO bluepy pybluez -c /usr/src/homeassistant/requirements_all.txt + RPi.GPIO bluepy pybluez -c /usr/src/homeassistant/requirements_all.txt \ + --use-deprecated=legacy-resolver ## # Set symlinks for raspberry pi binaries. diff --git a/machine/raspberrypi4-64 b/machine/raspberrypi4-64 index 165dc2e5397..51f41d68320 100644 --- a/machine/raspberrypi4-64 +++ b/machine/raspberrypi4-64 @@ -7,7 +7,8 @@ RUN apk --no-cache add \ usbutils \ && sed -i "s|# RPi.GPIO|RPi.GPIO|g" /usr/src/homeassistant/requirements_all.txt \ && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \ - RPi.GPIO bluepy pybluez -c /usr/src/homeassistant/requirements_all.txt + RPi.GPIO bluepy pybluez -c /usr/src/homeassistant/requirements_all.txt \ + --use-deprecated=legacy-resolver ## # Set symlinks for raspberry pi binaries. diff --git a/machine/tinker b/machine/tinker index 04a0aa6dc2c..9660ca71b9c 100644 --- a/machine/tinker +++ b/machine/tinker @@ -4,6 +4,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]