update tox

adds pypy, fixes deps for various versions