Adapting to PyPI 1