Readd tox.ini from master