From a6eff9977a2f6fb5feca8cecd64d117413de5618 Mon Sep 17 00:00:00 2001 From: dgtlmoon Date: Tue, 18 Jun 2024 11:13:00 +0200 Subject: [PATCH] Maybe this solves cryptography <-> rustc --- Dockerfile | 3 ++- requirements.txt | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5e45880c..a6839f88 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,8 @@ WORKDIR /install COPY requirements.txt /requirements.txt -RUN pip install --target=/dependencies -r /requirements.txt +# --extra-index-url https://www.piwheels.org/simple is for cryptography module to be prebuilt (or rustc etc needs to be installed) +RUN pip install --extra-index-url https://www.piwheels.org/simple --target=/dependencies -r /requirements.txt # Playwright is an alternative to Selenium # Excluded this package from requirements.txt to prevent arm/v6 and arm/v7 builds from failing diff --git a/requirements.txt b/requirements.txt index 090e03f1..2671f1a0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -41,10 +41,8 @@ apprise~=1.8.0 # use v1.x due to https://github.com/eclipse/paho.mqtt.python/issues/814 paho-mqtt>=1.6.1,<2.0.0 -# This mainly affects some ARM builds, which unlike the other builds ignores "ARG CRYPTOGRAPHY_DONT_BUILD_RUST=1" -# so without this pinning, the newer versions on ARM will forcefully try to build rust, which results in "rust compiler not found" -# (introduced once apprise became a dep) -cryptography~=3.4 +# Requires extra wheel for rPi +cryptography~=42.0.8 # Used for CSS filtering beautifulsoup4