dietpi-software: update Python deps

Also conditions are strictly ordered by architecture ID now.

Author: MichaIng

dietpi/dietpi-software

@@ -2580,38 +2580,38 @@ sudo sysctl -p /etc/sysctl.d/dietpi-$1.conf"
 					'--rust'|'-r') rust=1;;
 					'--no-piwheels'|'-P') piwheels=0;;
 					'av') (( $G_HW_ARCH < 3 || $G_HW_ARCH == 11 )) && aDEPS+=('libavdevice-dev');;
-					'bcrypt') (( $G_HW_ARCH == 11 || ( $G_HW_ARCH == 1 && ! $piwheels ) )) && rust=1;;
-					'brotli'|'sabctools') (( $G_HW_ARCH == 11 || ( $G_HW_ARCH < 3 && ! $piwheels ) )) && aDEPS+=('g++');;
-					'cffi') (( $G_HW_ARCH == 11 || ( $G_HW_ARCH < 3 && ! $piwheels ) )) && aDEPS+=('gcc' 'libffi-dev');;
+					'bcrypt') (( ( $G_HW_ARCH == 1 && ! $piwheels ) || $G_HW_ARCH == 11 )) && rust=1;;
+					'brotli'|'sabctools') (( ( $G_HW_ARCH < 3 && ! $piwheels ) || $G_HW_ARCH == 11 )) && aDEPS+=('g++');;
+					'cffi') (( ( $G_HW_ARCH < 3 && ! $piwheels ) || $G_HW_ARCH == 11 )) && aDEPS+=('gcc' 'libffi-dev');;
 					'cryptography')
-						if (( $G_HW_ARCH == 1 || $G_HW_ARCH == 11 ))
+						if (( ( $G_HW_ARCH == 1 && ! $piwheels ) || $G_HW_ARCH == 11 ))
 						then
 							aDEPS+=('pkg-config' 'libssl-dev')
 							rust=1
 						fi
 						set -- "$@" cffi
 					;;
-					'greenlet113') (( $python_version > 311 || $G_HW_ARCH == 11 || ( $G_HW_ARCH < 3 && ! $piwheels ) )) && aDEPS+=('g++');;
-					'isal') (( $G_HW_ARCH == 11 || ( $G_HW_ARCH < 3 && ! $piwheels ) )) && aDEPS+=('make');;
-					'libsass') (( $G_HW_ARCH == 10 || $piwheels )) || aDEPS+=('g++');;
+					'greenlet113') (( $python_version > 311 || ( $G_HW_ARCH < 3 && ! $piwheels ) || $G_HW_ARCH == 11 )) && aDEPS+=('g++');;
+					'isal') (( ( $G_HW_ARCH < 3 && ! $piwheels ) || $G_HW_ARCH == 11 )) && aDEPS+=('make');;
+					'libsass') (( $piwheels || $G_HW_ARCH == 10 )) || aDEPS+=('g++');;
 					'lxml') (( $G_HW_ARCH == 1 && ( ! $piwheels || $python_version != 311 ) )) && aDEPS+=('libxslt1-dev');;
 					'matrix-synapse')
 						(( $G_HW_ARCH < 3 || $G_HW_ARCH == 11 )) && rust=1
 						sed -- "$@" bcrypt cryptography pillow pynacl
 					;;
 					'netifaces') (( $piwheels )) || aDEPS+=('gcc');;
 					'numpy')
-						if (( $G_HW_ARCH == 11 || ( $G_HW_ARCH < 3 && ( ! $piwheels || $python_version != 311 ) ) ))
+						if (( ( $G_HW_ARCH < 3 && ! $piwheels ) || $G_HW_ARCH == 11 ))
 						then
 							aDEPS+=('g++' 'pkg-config' 'libopenblas-pthread-dev')
 							# cmake + make + automake > patchelf > meson-python > numpy
 							# cmake > ninja > meson-python > numpy
 							(( $G_HW_ARCH == 1 )) && aDEPS+=('cmake' 'make' 'automake')
 						fi
-						(( $piwheels && $python_version == 311 )) && aDEPS+=('libgfortran5' 'libopenblas0-pthread')
+						(( $piwheels )) && aDEPS+=('libgfortran5' 'libopenblas0-pthread')
 					;;
 					'pillow')
-						(( $G_HW_ARCH == 11 || ( $G_HW_ARCH < 3 && ( ! $piwheels || $python_version != 311 ) ) )) && aDEPS+=('gcc' 'libjpeg62-turbo-dev' 'zlib1g-dev')
+						(( ( $G_HW_ARCH < 3 && ( ! $piwheels || $python_version != 311 ) ) || $G_HW_ARCH == 11 )) && aDEPS+=('gcc' 'libjpeg62-turbo-dev' 'zlib1g-dev')
 						(( $piwheels && $python_version == 311 )) && aDEPS+=('libopenjp2-7' 'libtiff6' 'libxcb1')
 					;;
 					'poetry')
@@ -2620,8 +2620,8 @@ sudo sysctl -p /etc/sysctl.d/dietpi-$1.conf"
 					;;
 					'psutil') (( $G_HW_ARCH < 3 || $G_HW_ARCH == 11 )) && aDEPS+=('gcc');;
 					'psycopg2') (( $piwheels )) || aDEPS+=('gcc' 'libpq-dev');;
-					'pycares') (( $G_HW_ARCH == 11 || ( $G_HW_ARCH < 3 && ! $piwheels ) )) && aDEPS+=('cmake');;
-					'pycurl') (( $G_HW_ARCH == 11 || ( $G_HW_ARCH < 3 && ! $piwheels ) )) && aDEPS+=('gcc' 'libcurl4-openssl-dev' 'libssl-dev');;
+					'pycares') (( ( $G_HW_ARCH < 3 && ! $piwheels ) || $G_HW_ARCH == 11 )) && aDEPS+=('cmake');;
+					'pycurl') (( ( $G_HW_ARCH < 3 && ! $piwheels ) || $G_HW_ARCH == 11 )) && aDEPS+=('gcc' 'libcurl4-openssl-dev' 'libssl-dev');;
 					'pydantic')
 						# pydantic_core > pydantic
 						(( $G_HW_ARCH == 1 || $G_HW_ARCH == 11 )) && rust=1
@@ -2636,10 +2636,10 @@ sudo sysctl -p /etc/sysctl.d/dietpi-$1.conf"
 					;;
 					'pymicro-vad') aDEPS+=('g++');;
 					'pynacl')
-						(( $G_HW_ARCH == 11 || ( $G_HW_ARCH < 3 && ! $piwheels ) )) && aDEPS+=('make')
+						(( ( $G_HW_ARCH < 3 && ! $piwheels ) || $G_HW_ARCH == 11 )) && aDEPS+=('make')
 						set -- "$@" cffi
 					;;
-					'ujson') (( $G_HW_ARCH == 11 || ( $G_HW_ARCH < 3 && ( ! $piwheels || $python_version != 311 ) ) )) && aDEPS+=('g++');;
+					'ujson') (( ( $G_HW_ARCH < 3 && ( ! $piwheels || $python_version != 311 ) ) || $G_HW_ARCH == 11 )) && aDEPS+=('g++');;
 					*) G_DIETPI-NOTIFY 1 "Unknown argument \"$1\" for Python_Deps(). This should never happen unless you are developing a software implementation. Otherwise, please report this at https://github.com/MichaIng/DietPi/issues. Aborting ..."; exit 1;;
 				esac
 				shift