8.3.2
Merge pull request #12467 from RonnyPfannschmidt/ronny/new-annotations-try-2
RFC: from __future__ import annotations + migrate
Revert "Remove deprecated py.path hook arguments"