PyPI-compatibility changes