Pypi adaptation