Merge "Upddate tox config"