Update __init__.py files for latest pupa
switch to new-style metadata
fixes for pupa updates