build

handle merge conflict #4972

Job	Run time
pre-commit	38s
ghcr-build-and-push-on-develop	0s
test (ubuntu-22.04, 3.11)	1m 17s
test (ubuntu-22.04, 3.14)	7m 31s
test (ubuntu-22.04, 3.13)	1m 21s
test (ubuntu-22.04, 3.10)	7m 32s
test (ubuntu-22.04, 3.12)	1m 12s
test (macos-15-intel, 3.13)	2m 1s
test (macos-15-intel, 3.12)	2m 8s
test (windows-2022, 3.11)	2m 11s
test (macos-15-intel, 3.11)	2m 5s
test (macos-15-intel, 3.10)	7m 34s
test (windows-2022, 3.12)	2m 9s
test (windows-2022, 3.14)	7m 28s
test (windows-2022, 3.10)	7m 28s
test (windows-2022, 3.13)	2m 4s
test (macos-15-intel, 3.14)	7m 32s
SonarCloud	1s
package	1s
deploy	1s
check-deploy	1s
ghcr-build-and-push-on-release	1s
	1h 2m 16s

Provide feedback