Merge "[DOC] Prepare tox.ini for new tox version"