Resolve CWG-43 and CWG-42 by applying tox 4 compatability.

Corné Lukkenrequested to merge
CWG-43 into main

Closes CWG-43 Closes CWG-42

Edited by Corné Lukken

Merge request reports