diff --git a/Dockerfile.buster b/Dockerfile.buster index 66abcc508..95d3c677f 100644 --- a/Dockerfile.buster +++ b/Dockerfile.buster @@ -40,28 +40,30 @@ COPY contrib/python3-voltcraft-sem6000.patch.diff . # requirements are slightly different for docker # overruling does not work here, pip will exit with non 0 which will stop the build -RUN sed -i 's/paho-mqtt==.*//g' requirements.txt \ - && sed -i 's/icalendar==.*//g' requirements.txt \ - && sed -i 's/requests==.*/requests==2.31.0/g' requirements.txt \ - && sed -i 's/numpy==.*/numpy==1.21.4/g' requirements.txt \ - && sed -i 's/wheel==.*/wheel==0.42.0/g' requirements.txt \ - && sed -i 's/pip==.*/pip==24.0/g' requirements.txt \ +RUN sed -i 's/pip==.*/pip==24.0/g' requirements.txt \ && sed -i 's/setuptools==.*/setuptools==68.0.0/g' requirements.txt \ - && sed -i 's/bcrypt==.*/bcrypt==4.1.3/g' requirements.txt \ + && sed -i 's/wheel==.*/wheel==0.42.0/g' requirements.txt \ + && sed -i 's/yoyo-migrations==.*/yoyo-migrations==8.2.0/g' requirements.txt \ && sed -i 's/python-dotenv==.*/python-dotenv==0.21.1/g' requirements.txt \ && sed -i 's/gevent==.*/gevent==22.10.2/g' requirements.txt \ + && sed -i 's/bcrypt==.*/bcrypt==4.1.3/g' requirements.txt \ + && sed -i 's/cryptography==.*/cryptography==44.0.1/g' requirements.txt \ + && sed -i 's/Pillow==.*/Pillow==9.5.0/g' requirements.txt \ + && sed -i 's/numpy==.*/numpy==1.21.4/g' requirements.txt \ + && sed -i 's/opencv-python-headless==.*/opencv-python-headless==4.6.0.66/g' requirements.txt \ + && sed -i 's/gpiozero==.*/gpiozero==1.6.2/g' requirements.txt \ + && sed -i 's/requests==.*/requests==2.31.0/g' requirements.txt \ && sed -i 's/python-kasa==.*/python-kasa==0.5.1/g' requirements.txt \ && sed -i 's/pywemo==.*/pywemo==0.9.2/g' requirements.txt \ - && sed -i 's/Pillow==.*/Pillow==9.5.0/g' requirements.txt \ + && sed -i 's/Adafruit-Blinka==.*/Adafruit-Blinka==8.43.0/g' requirements.txt \ && sed -i 's/icalevents==.*/icalevents==0.1.25/g' requirements.txt \ && sed -i 's/packaging==.*/packaging==24.0/g' requirements.txt \ && sed -i 's/pyfiglet==.*/pyfiglet==0.8.post1/g' requirements.txt \ && sed -i 's/python-telegram-bot\[socks,http2\]==.*/python-telegram-bot\[socks,http2\]==20.3/g' requirements.txt \ - && sed -i 's/pydantic==.*/pydantic==1.10.9/g' requirements.txt \ - && sed -i 's/gpiozero==.*/gpiozero==1.6.2/g' requirements.txt \ - && sed -i 's/Adafruit-Blinka==.*/Adafruit-Blinka==8.43.0/g' requirements.txt \ && sed -i 's/adafruit-circuitpython-typing==.*/adafruit-circuitpython-typing==1.10.1/g' requirements.txt \ - && sed -i 's/yoyo-migrations==.*/yoyo-migrations==8.2.0/g' requirements.txt \ + && sed -i 's/pydantic==.*/pydantic==1.10.9/g' requirements.txt \ + && sed -i 's/paho-mqtt==.*//g' requirements.txt \ + && sed -i 's/icalendar==.*//g' requirements.txt \ && pip install smbus==1.1.post2 --extra-index-url https://www.piwheels.org/simple \ && pip install -r requirements.txt --extra-index-url https://www.piwheels.org/simple \ && find /opt/venv -type d -name "test*" | xargs rm -rf \ diff --git a/docs/_faq/known_errors.md b/docs/_faq/known_errors.md index c66ff56ce..0e2445c56 100644 --- a/docs/_faq/known_errors.md +++ b/docs/_faq/known_errors.md @@ -9,10 +9,19 @@ list of known messages which you can ignore. ## Bottle -``` +```text /home/pi/TerrariumPI/venv/lib/python3.7/site-packages/bottle.py:3383: DeprecationWarning: Absolute template path names are deprecated. fname = self.search(name, self.lookup) ``` This message is very old, and TerrariumPI does not use bottle template engines. So this message can be ignored. + +## Cryptography + +```text +/home/pi/TerrariumPI/venv/lib/python3.7/site-packages/telegram/_passport/credentials.py:25: CryptographyDeprecationWarning: Python 3.7 is no longer supported by the Python core team and support for it is deprecated in cryptography. A future release of cryptography will remove support for Python 3.7. + from cryptography.hazmat.backends import default_backend +``` + +This is a warning that in the next update of Cryptography, python 3.7 is not supported anymore. This impacts only old buster OS. For now, we can still use it. diff --git a/install.sh b/install.sh index 04698984f..5c56c2fe4 100755 --- a/install.sh +++ b/install.sh @@ -56,9 +56,11 @@ if [ "${OS}" == "buster" ]; then PIP_MODULES="${PIP_MODULES//gevent==+([^ ])/gevent==22.10.2}" PIP_MODULES="${PIP_MODULES//bcrypt==+([^ ])/bcrypt==4.1.3}" + PIP_MODULES="${PIP_MODULES//cryptography==+([^ ])/cryptography==44.0.1}" PIP_MODULES="${PIP_MODULES//Pillow==+([^ ])/Pillow==9.5.0}" PIP_MODULES="${PIP_MODULES//numpy==+([^ ])/numpy==1.21.4}" + PIP_MODULES="${PIP_MODULES//opencv-python-headless==+([^ ])/opencv-python-headless==4.6.0.66}" PIP_MODULES="${PIP_MODULES//gpiozero==+([^ ])/gpiozero==1.6.2}" PIP_MODULES="${PIP_MODULES//requests==+([^ ])/requests==2.31.0}" @@ -75,8 +77,8 @@ if [ "${OS}" == "buster" ]; then PIP_MODULES="${PIP_MODULES//python-telegram-bot\[socks,http2\]==+([^ ])/python-telegram-bot\[socks,http2\]==20.3}" - PIP_MODULES="${PIP_MODULES//pydantic==+([^ ])/pydantic==1.10.9}" PIP_MODULES="${PIP_MODULES//adafruit-circuitpython-typing==+([^ ])/adafruit-circuitpython-typing==1.10.1}" + PIP_MODULES="${PIP_MODULES//pydantic==+([^ ])/pydantic==1.10.9}" OPENCV_PACKAGES="libopenexr23 libilmbase23 liblapack3 libatlas3-base" diff --git a/requirements.txt b/requirements.txt index 7e61de23b..bbf11f8a8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,7 @@ retry==0.9.2 # !! Check first: https://piwheels.org/project/bcrypt/ !! bcrypt==4.2.1 # !! Check first: https://piwheels.org/project/cryptography/ !! -cryptography==42.0.8 +cryptography==44.0.1 # Webcam packages Pillow==10.4.0 @@ -28,7 +28,7 @@ Pillow==10.4.0 # Version 2 needs to be supported for all sub projects. Do not upgrade !! numpy==1.26.4 # !! Check first: https://piwheels.org/project/opencv-python-headless/ !! -opencv-python-headless==4.6.0.66 +opencv-python-headless==4.11.0.86 piexif==1.1.3 # Hardware / sensors packages