future annotations in a few files, so it works fine on python 3.8 still
4 files changed