Skip to content

Commit e21368e

Browse files
committed
dietpi-software: further Python deps updates
1 parent 10422cd commit e21368e

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

dietpi/dietpi-software

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2596,8 +2596,8 @@ sudo sysctl -p /etc/sysctl.d/dietpi-$1.conf"
25962596
'libsass') (( $piwheels || $G_HW_ARCH == 10 )) || aDEPS+=('g++');;
25972597
'lxml') (( $G_HW_ARCH == 1 && ( ! $piwheels || $python_version != 311 ) )) && aDEPS+=('libxslt1-dev');;
25982598
'matrix-synapse')
2599-
(( $G_HW_ARCH < 3 || $G_HW_ARCH == 11 )) && rust=1
2600-
sed -- "$@" bcrypt cryptography pillow pynacl
2599+
(( ( $G_HW_ARCH < 3 && ! $piwheels ) || $G_HW_ARCH == 11 )) && rust=1
2600+
sed -- "$@" bcrypt cffi cryptography pillow pydantic pynacl
26012601
;;
26022602
'netifaces') (( $piwheels )) || aDEPS+=('gcc');;
26032603
'numpy')
@@ -2620,11 +2620,14 @@ sudo sysctl -p /etc/sysctl.d/dietpi-$1.conf"
26202620
;;
26212621
'psutil') (( $G_HW_ARCH < 3 || $G_HW_ARCH == 11 )) && aDEPS+=('gcc');;
26222622
'psycopg2') (( $piwheels )) || aDEPS+=('gcc' 'libpq-dev');;
2623-
'pycares') (( ( $G_HW_ARCH < 3 && ! $piwheels ) || $G_HW_ARCH == 11 )) && aDEPS+=('cmake');;
2623+
'pycares')
2624+
(( ( $G_HW_ARCH < 3 && ! $piwheels ) || $G_HW_ARCH == 11 )) && aDEPS+=('cmake')
2625+
set -- "$@" cffi
2626+
;;
26242627
'pycurl') (( ( $G_HW_ARCH < 3 && ! $piwheels ) || $G_HW_ARCH == 11 )) && aDEPS+=('gcc' 'libcurl4-openssl-dev' 'libssl-dev');;
26252628
'pydantic')
26262629
# pydantic_core > pydantic
2627-
(( $G_HW_ARCH == 1 || $G_HW_ARCH == 11 )) && rust=1
2630+
(( $G_HW_ARCH == 1 && ! $piwheels )) && rust=1
26282631
;;
26292632
'pyenv')
26302633
# Required: gcc libc6-dev make libssl-dev zlib1g-dev
@@ -2634,7 +2637,7 @@ sudo sysctl -p /etc/sysctl.d/dietpi-$1.conf"
26342637
# Python < 3.12: https://dietpi.com/forum/t/24975/2
26352638
(( $python_version < 312 )) && aDEPS+=('patch')
26362639
;;
2637-
'pymicro-vad') aDEPS+=('g++');;
2640+
'pymicro-vad') (( $G_HW_ARCH < 3 || $G_HW_ARCH == 11 )) && aDEPS+=('g++');;
26382641
'pynacl')
26392642
(( ( $G_HW_ARCH < 3 && ! $piwheels ) || $G_HW_ARCH == 11 )) && aDEPS+=('make')
26402643
set -- "$@" cffi

0 commit comments

Comments
 (0)